Package: sysv-rc
Version: 2.86.ds1-1.1
Severity: minor
Tags: patch
There is no reason to use two different scripts for running rcS.d and
rc#.d/. This patch merge the special parts of rcS into rc, and make
sure rcS calls rc with 'S' as the argument.
Most of the special parts of rcS should probably be removed, as
neither /sbin/unconfigured.sh nor /sbin/setup.sh are used by the
installation system any more.
This change make it easier to add parallel booting, as the changes
only need to be done in one script.
--- sysvinit-2.86.ds1.orig/debian/sysv-rc/etc/init.d/rc 2005-09-03
14:20:14.083376736 +0200
+++ sysvinit-2.86.ds1/debian/sysv-rc/etc/init.d/rc 2005-09-03
14:24:01.167236396 +0200
@@ -15,6 +15,10 @@
# Version: @(#)rc 2.78 07-Nov-1999 [EMAIL PROTECTED]
#
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+export PATH
+umask 022
+
# Un-comment the following for debugging.
# debug=echo
@@ -53,6 +57,21 @@
export runlevel previous
+ if [ S = "$runlevel" ]
+ then
+ #
+ # See if system needs to be setup. This is ONLY meant to
+ # be used for the initial setup after a fresh installation!
+ #
+ if [ -x /sbin/unconfigured.sh ]
+ then
+ /sbin/unconfigured.sh
+ fi
+ fi
+
+ . /etc/default/rcS
+ export VERBOSE
+
# Is there an rc directory for this new runlevel?
if [ -d /etc/rc$runlevel.d ]
then
@@ -99,4 +118,21 @@
esac
done
fi
+
+ if [ S = "$runlevel" ]
+ then
+ #
+ # For compatibility, run the files in /etc/rc.boot too.
+ #
+ [ -d /etc/rc.boot ] && run-parts /etc/rc.boot
+
+ #
+ # Finish setup if needed. The comment above about
+ # /sbin/unconfigured.sh applies here as well!
+ #
+ if [ -x /sbin/setup.sh ]
+ then
+ /sbin/setup.sh
+ fi
+ fi
# eof /etc/init.d/rc
--- sysvinit-2.86.ds1.orig/debian/sysv-rc/etc/init.d/rcS 2005-09-03
14:20:14.083376736 +0200
+++ sysvinit-2.86.ds1/debian/sysv-rc/etc/init.d/rcS 2005-09-03
14:24:35.579881215 +0200
@@ -5,68 +5,4 @@
#
# Version: @(#)/etc/init.d/rcS 2.76 19-Apr-1999 [EMAIL PROTECTED]
#
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-runlevel=S
-prevlevel=N
-umask 022
-export PATH runlevel prevlevel
-
-#
-# See if system needs to be setup. This is ONLY meant to
-# be used for the initial setup after a fresh installation!
-#
-if [ -x /sbin/unconfigured.sh ]
-then
- /sbin/unconfigured.sh
-fi
-
-#
-# Source defaults.
-#
-. /etc/default/rcS
-export VERBOSE
-
-#
-# Trap CTRL-C &c only in this shell so we can interrupt subprocesses.
-#
-trap ":" INT QUIT TSTP
-
-#
-# Call all parts in order.
-#
-for i in /etc/rcS.d/S??*
-do
- # Ignore dangling symlinks for now.
- [ ! -f "$i" ] && continue
-
- case "$i" in
- *.sh)
- # Source shell script for speed.
- (
- trap - INT QUIT TSTP
- set start
- . $i
- )
- ;;
- *)
- # No sh extension, so fork subprocess.
- $i start
- ;;
- esac
-done
-
-#
-# For compatibility, run the files in /etc/rc.boot too.
-#
-[ -d /etc/rc.boot ] && run-parts /etc/rc.boot
-
-#
-# Finish setup if needed. The comment above about
-# /sbin/unconfigured.sh applies here as well!
-#
-if [ -x /sbin/setup.sh ]
-then
- /sbin/setup.sh
-fi
-
+exec /etc/init.d/rc S
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
