[Devil-linux-commit] build/config/etc/init.d boot,1.20,1.21 boot.local,1.1,1.2 rc,1.9,1.10

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1368/config/etc/init.d

Modified Files:
	boot boot.local rc 
Log Message:
added support for boot.d to rc script
insserv ignored *.local files
added procinfo and iptstate to tty7/8, don't know how it disapppeared....


Index: boot.local
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/boot.local,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- boot.local	20 Mar 2004 16:21:51 -0000	1.1
+++ boot.local	22 Mar 2004 00:25:25 -0000	1.2
@@ -9,7 +9,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       boot.local
-# Required-Start: boot mountfs checkfs setfileperm localnet setclock loadkeys
+# Required-Start: setclock loadkeys
 # Required-Stop:
 # Default-Start:  B
 # Default-Stop:

Index: boot
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/boot,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- boot	20 Mar 2004 01:16:55 -0000	1.20
+++ boot	22 Mar 2004 00:25:24 -0000	1.21
@@ -13,10 +13,10 @@
 
 ### BEGIN INIT INFO
 # Provides:       boot
-# Required-Start: 
-# Required-Stop:  
-# Default-Start:  
-# Default-Stop:   
+# Required-Start:
+# Required-Stop:
+# Default-Start:  B
+# Default-Stop:
 # Description:    initializes the base system
 ### END INIT INFO
 
@@ -62,23 +62,4 @@
 	modprobe apm power_off=1
 fi
 
-#
-# Start boot.d scripts.
-#
-if test -d /etc/init.d/boot.d/ ; then
-    for i in /etc/init.d/boot.d/S*; do
-        test -x $i || continue
-        /bin/sh $i start
-    done
-fi
-
-#
-# Start user defined bootup script.
-#
-if test -f /etc/init.d/boot.local ; then
-        echo -n "Running /etc/init.d/boot.local"
-        /bin/sh /etc/init.d/boot.local
-	evaluate_retval
-fi
-
 exit 0

Index: rc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/rc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rc	14 Mar 2002 01:57:56 -0000	1.9
+++ rc	22 Mar 2004 00:25:25 -0000	1.10
@@ -23,12 +23,18 @@
 	exit 1
 fi
 
+if [ "$runlevel" = "boot" ]; then
+	RUNLEVELDIR=$rc_base/$runlevel.d
+else
+	RUNLEVELDIR=$rc_base/rc$runlevel.d
+fi
+
 previous=$PREVLEVEL
 [ "$previous" = "" ] && previous=N
 
-if [ ! -d $rc_base/rc$runlevel.d ]
+if [ ! -d $RUNLEVELDIR ]
 then
-	echo "$rc_base/rc$runlevel.d does not exist"
+	echo "$RUNLEVELDIR does not exist"
 	exit 1
 fi
 
@@ -43,17 +49,13 @@
 		check_script_status
 
 		suffix=${i##*/K$numrex}
-		set -- $rc_base/rc$runlevel.d/S$numrex$suffix
+		set -- $RUNLEVELDIR/S$numrex$suffix
 
 		[ -x "$1" ] && continue
 		
 		$i stop
 		error_value=$?
 
-		#if [ "$error_value" != "0" ]
-		#then
-		#	print_error_msg
-		#fi
 	done
 fi
 
@@ -65,14 +67,10 @@
 
 		$i stop
 		error_value=$?
-		#if [ "$error_value" != "0" ]
-		#then
-		#	print_error_msg
-		#fi
 	done
 fi
 
-for i in $( ls -v $rc_base/rc$runlevel.d/S* 2> /dev/null)
+for i in $( ls -v $RUNLEVELDIR/S* 2> /dev/null)
 do
 	if [ "$previous" != "N" ]
 	then
@@ -88,11 +86,6 @@
 
 	$i start
 	error_value=$?
-
-	#if [ "$error_value" != "0" ]
-	#then
-	#	print_error_msg
-	#fi
 done
 
 # End $rc_base/init.d/rc