[Initng-svn] r2341 - initng/initfiles/daemon

[svn at initng.thinktux.net]

Author: jimmy
Date: Mon Dec  5 23:04:28 2005
New Revision: 2341

Modified:
   initng/initfiles/daemon/xfs.ii
Log:
Fixes bug 314


Modified: initng/initfiles/daemon/xfs.ii
==============================================================================
--- initng/initfiles/daemon/xfs.ii	(original)
+++ initng/initfiles/daemon/xfs.ii	Mon Dec  5 23:04:28 2005
@@ -14,12 +14,14 @@
 	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 [ -x @/usr/sbin/chkfontpath@ ]
+		then
+		  # 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"
@@ -44,7 +46,8 @@
 					fi
 				fi
 			fi
-		done
+		  done
+		fi
 		# 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=/
@@ -63,6 +66,8 @@
 daemon daemon/xfs {
 #ifd linspire
 	need = system/initial system/mount_sys_fs system/bootmisc daemon/xfs/chkfontpath;
+#ifd gentoo
+	need = system/initial system/mountfs system/bootmisc;
 #elsed
 	need = system/initial system/mountfs system/bootmisc daemon/xfs/chkfontpath;
 #endd