[Initng-svn] r1991 - initng/initfiles/system

[svn at initng.thinktux.net]

Author: jimmy
Date: Tue Nov  8 01:09:38 2005
New Revision: 1991

Modified:
   initng/initfiles/system/laptop-mode.ii
   initng/initfiles/system/lm-sensors.ii
   initng/initfiles/system/local.ii
   initng/initfiles/system/makedev.ii
   initng/initfiles/system/modules.ii
Log:
More modules.


Modified: initng/initfiles/system/laptop-mode.ii
==============================================================================
--- initng/initfiles/system/laptop-mode.ii	(original)
+++ initng/initfiles/system/laptop-mode.ii	Tue Nov  8 01:09:38 2005
@@ -6,23 +6,23 @@
 service system/laptop-mode {
 	need = system/initial system/mountfs
 start {
-	touch /var/run/laptop-mode-enabled
+	@touch@ /var/run/laptop-mode-enabled
 
 	# Run it with "force" so that syslog.conf and hdparm settings
 	# are set correctly at system bootup.
-	if [ -e /usr/sbin/laptop_mode ]; then
-	    /usr/sbin/laptop_mode auto force > /dev/null
-	elif [ -e /usr/sbin/laptop-mode ]; then
-	    /usr/sbin/laptop-mode auto force > /dev/null
+	if [ -e @/usr/sbin/laptop_mode@ ]; then
+	    @/usr/sbin/laptop_mode@ auto force > /dev/null
+	elif [ -e @/usr/sbin/laptop-mode@ ]; then
+	    @/usr/sbin/laptop-mode@ auto force > /dev/null
 	else
-	    echo "laptop_mode not found!"
+	    @echo@ "laptop_mode not found!"
 	    exit 1
 	fi
 	exit 0
 }
 stop {
 	rm -f /var/run/laptop-mode-enabled
-	if ! ( /usr/sbin/laptop_mode stop > /dev/null ) ; then
+	if ! ( @/usr/sbin/laptop_mode@ stop > /dev/null ) ; then
 		exit 1
 	fi
 	

Modified: initng/initfiles/system/lm-sensors.ii
==============================================================================
--- initng/initfiles/system/lm-sensors.ii	(original)
+++ initng/initfiles/system/lm-sensors.ii	Tue Nov  8 01:09:38 2005
@@ -2,11 +2,11 @@
     need system/initial
 start {
     if [ "$VERBOSE" = "yes" ]; then
-	/usr/bin/sensors -s
-	/usr/bin/sensors > /dev/null
+	@/usr/bin/sensors@ -s
+	@/usr/bin/sensors@ > /dev/null
     else
-	/usr/bin/sensors -s 1> /dev/null 2> /dev/null
-	/usr/bin/sensors 1> /dev/null 2> /dev/null
+	@/usr/bin/sensors@ -s 1> /dev/null 2> /dev/null
+	@/usr/bin/sensors@ 1> /dev/null 2> /dev/null
     fi
 }
 

Modified: initng/initfiles/system/local.ii
==============================================================================
--- initng/initfiles/system/local.ii	(original)
+++ initng/initfiles/system/local.ii	Tue Nov  8 01:09:38 2005
@@ -1,8 +1,8 @@
 service system/local {
 	need = system/initial system/mountfs
 	use = system/coldplug
-	start = /bin/bash
-	stop = /bin/bash
+	start = @/bin/bash@
+	stop = @/bin/bash@
 	start_args = /etc/conf.d/local.start
 	stop_args = /etc/conf.d/local.stop
 }

Modified: initng/initfiles/system/makedev.ii
==============================================================================
--- initng/initfiles/system/makedev.ii	(original)
+++ initng/initfiles/system/makedev.ii	Tue Nov  8 01:09:38 2005
@@ -6,10 +6,8 @@
 start {
 
 
-    PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
     set -e
-    test -L /dev/MAKEDEV || ln -fs /sbin/MAKEDEV /dev/MAKEDEV
+    test -L /dev/MAKEDEV || ln -fs @/sbin/MAKEDEV@ /dev/MAKEDEV
 
     # create dvb-devices, if the dvb-directory allready exists, and 
     # no devfs is used (this a workaround for the changed major-number

Modified: initng/initfiles/system/modules.ii
==============================================================================
--- initng/initfiles/system/modules.ii	(original)
+++ initng/initfiles/system/modules.ii	Tue Nov  8 01:09:38 2005
@@ -9,28 +9,42 @@
 
 # Here we should fail, as a modular kernel do need
 # depmod command ...
-if [ ! -e /lib/modules/`uname -r`/modules.dep ]
+if [ ! -e /lib/modules/`@uname@ -r`/modules.dep ]
 then
-    if [ ! -x /sbin/depmod ]
+    if [ ! -x @/sbin/depmod@ ]
     then
-	echo "ERROR:  system is missing /sbin/depmod !"
+	@echo@ "ERROR:  system is missing @/sbin/depmod@ !"
 	exit 1
     fi
+#ifdist gentoo
+	@/sbin/modules-update@
+#elsed
+	@/sbin/depmod@
+#endd
+    exit 0
 else
-    echo "Found modules.dep, skipping depmod ..."
+    @echo@ "Found modules.dep, skipping depmod ..."
 fi
 
+
+# if /etc/modules.d is newer then /etc/modules.conf
+
 if [ /etc/modules.d -nt /etc/modules.conf ]
     then
-	echo "Calculating module dependencies ..."
-	if [ ! -x /sbin/depmod ]
+	@echo@ "Calculating module dependencies ..."
+	if [ ! -x @/sbin/depmod@ ]
 	then
-	    echo "ERROR:  system is missing /sbin/depmod !"
+	    @echo@ "ERROR:  system is missing @/sbin/depmod@ !"
 	    exit 1
 	fi
-	/sbin/modules-update &>/dev/null
+#ifdist gentoo
+	@/sbin/modules-update@
+#elsed
+	@/sbin/depmod@
+#endd
+    exit 0
 else
-	echo "Module dependencies up to date ..."
+	@echo@ "Module dependencies up to date ..."
 fi
 
 wait