[Initng-svn] r2331 - in initng: . initfiles/daemon
svn at initng.thinktux.net
svn at initng.thinktux.net
Mon Dec 5 00:34:56 CET 2005
Author: deac
Date: Mon Dec 5 00:34:55 2005
New Revision: 2331
Modified:
initng/Makefile.am
initng/configure.in
initng/initfiles/daemon/xfs.ii
Log:
install-recursive depend on initng-paths.h
Modified: initng/Makefile.am
==============================================================================
--- initng/Makefile.am (original)
+++ initng/Makefile.am Mon Dec 5 00:34:55 2005
@@ -12,13 +12,15 @@
CODING_STANDARDS \
TEMPLATE_HEADER
+install-recursive: $(BUILT_SOURCES)
+
install: install-recursive
@echo
@echo "Initng is installed. Add "init=/sbin/initng" in your bootloader configuration"
@echo "eg. at the end of the kernel line in /boot/grub/grub.conf"
@echo "Have a lot of fun!"
@echo
- ./gen_system_runlevel $(DESTDIR)
+ $(top_builddir)/gen_system_runlevel $(DESTDIR)
@echo
@echo "If you have initng running, you can reload it with:"
@echo "# /sbin/ngc -c"
Modified: initng/configure.in
==============================================================================
--- initng/configure.in (original)
+++ initng/configure.in Mon Dec 5 00:34:55 2005
@@ -28,7 +28,6 @@
-Wformat-nonliteral \
-Wformat-security \
-Wsequence-point \
--Wuninitialized \
-Wundef \
-Wunused \
-Wcomment \
Modified: initng/initfiles/daemon/xfs.ii
==============================================================================
--- initng/initfiles/daemon/xfs.ii (original)
+++ initng/initfiles/daemon/xfs.ii Mon Dec 5 00:34:55 2005
@@ -5,55 +5,66 @@
# description: Starts and stops the X Font Server at boot time and shutdown. \
# It also takes care of (re-)generating font lists.
-daemon daemon/xfs {
+service daemon/xfs/chkfontpath {
#ifd linspire
need = system/initial system/mount_sys_fs system/bootmisc;
#elsed
need = system/initial system/mountfs system/bootmisc;
#endd
- script daemon = {
- umask 133
- FC_CACHE=/usr/bin/fc-cache
+ script start = {
+ umask 133
- # chkfontpath output filtering, strips all of the junk output by
- # chkfontpath that we do not want, including headers, FPE numbers and
- # whitespace and other junk. Also filters out FPE's with trailing
- # modifiers such as ":unscaled" et al.
- for dir in $(/usr/sbin/chkfontpath --list | sed -e '/^Current/d;s#^[0-9]*: ##g;s#^/.*:[a-z]*$##g;/^[[:space:]]*$/d' | sort | uniq) ;do
- if [ -d "$dir" ]; then
- cd "$dir"
- # If fonts.dir does not exist, or if there are files in the
- # directory with a newer change time, regenerate fonts.dir, etc.
- # Using "-cnewer" here fixes bug #53737
- if [ ! -e fonts.dir ] || [ -n "$(@find@ . -maxdepth 1 -type f -cnewer fonts.dir -not -name 'fonts.cache*')" ]; then
- rm -f fonts.dir
- if ls | @grep@ -iqs '\.ot[cf]$' ; then
- # Opentype fonts found, generate fonts.scale and fonts.dir
- @mkfontscale@ . && @mkfontdir@ . &>/dev/null
- elif ls | @grep@ -iqs '\.tt[cf]$' ; then
- # TrueType fonts found, generate fonts.scale and fonts.dir
- @ttmkfdir@ -d . -o fonts.scale && @mkfontdir@ . &>/dev/null
- elif ls | @grep@ -Eiqsv '(^fonts\.(scale|alias|cache.*)$|.+(\.[ot]t[cf]|dir)$)' ; then
- # This directory contains non-TrueType/non-Opentype fonts
- @mkfontdir@ . &>/dev/null
- fi
- fi
- fi
- done
- # Now we run fc-cache, assuming fonts may have been added, without
- # explicitly checking, as it is rather fast anyway. Some older versions
- # of fc-cache will SEGV, which is prevented by invoking it with HOME=/
- [ -x "$FC_CACHE" ] && HOME=/ "$FC_CACHE"
+ # chkfontpath output filtering, strips all of the junk output by
+ # chkfontpath that we do not want, including headers, FPE numbers and
+ # whitespace and other junk. Also filters out FPE's with trailing
+ # modifiers such as ":unscaled" et al.
+ for dir in $(@/usr/sbin/chkfontpath@ --list | @sed@ -e '/^Current/d;s#^[0-9]*: ##g;s#^/.*:[a-z]*$##g;/^[[:space:]]*$/d' | @sort@ | @uniq@)
+ do
+ if [ -d "$dir" ]
+ then
+ cd "$dir"
+ # If fonts.dir does not exist, or if there are files in the
+ # directory with a newer change time, regenerate fonts.dir, etc.
+ # Using "-cnewer" here fixes bug #53737
+ if [ ! -e fonts.dir ] || [ -n "$(@find@ . -maxdepth 1 -type f -cnewer fonts.dir -not -name 'fonts.cache*')" ]
+ then
+ @rm@ -f fonts.dir
+ if @ls@ | @grep@ -iqs '\.ot[cf]$'
+ then
+ # Opentype fonts found, generate fonts.scale and fonts.dir
+ @mkfontscale@ . && @mkfontdir@ . >/dev/null 2>&1
+ elif @ls@ | @grep@ -iqs '\.tt[cf]$'
+ then
+ # TrueType fonts found, generate fonts.scale and fonts.dir
+ @ttmkfdir@ -d . -o fonts.scale && @mkfontdir@ . >/dev/null 2>&1
+ elif @ls@ | @grep@ -Eiqsv '(^fonts\.(scale|alias|cache.*)$|.+(\.[ot]t[cf]|dir)$)'
+ then
+ # This directory contains non-TrueType/non-Opentype fonts
+ @mkfontdir@ . >/dev/null 2>&1
+ fi
+ fi
+ fi
+ done
+ # Now we run fc-cache, assuming fonts may have been added, without
+ # explicitly checking, as it is rather fast anyway. Some older versions
+ # of fc-cache will SEGV, which is prevented by invoking it with HOME=/
+ [ -x "/usr/bin/fc-cache" ] && HOME=/ "/usr/bin/fc-cache"
- FONT_UNIX_DIR=/tmp/.font-unix
- # Clean out .font-unix dir, and recreate it with the proper ownership and
- # permissions.
- rm -rf $FONT_UNIX_DIR
- mkdir $FONT_UNIX_DIR
- chown root:root $FONT_UNIX_DIR
- chmod 1777 $FONT_UNIX_DIR
-
- exec @/usr/X11R6/bin/xfs@ -droppriv -nodaemon
-}
+ FONT_UNIX_DIR=/tmp/.font-unix
+ # Clean out .font-unix dir, and recreate it with the proper ownership and
+ # permissions.
+ rm -rf $FONT_UNIX_DIR
+ mkdir $FONT_UNIX_DIR
+ chown root:root $FONT_UNIX_DIR
+ chmod 1777 $FONT_UNIX_DIR
+ };
}
+daemon daemon/xfs {
+#ifd linspire
+ need = system/initial system/mount_sys_fs system/bootmisc daemon/xfs/chkfontpath;
+#elsed
+ need = system/initial system/mountfs system/bootmisc daemon/xfs/chkfontpath;
+#endd
+ exec daemon = @/usr/bin/xfs@ -droppriv -nodaemon;
+}
More information about the Initng-svn
mailing list