See contrib/lsb-v3/ChangeLog

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8555 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

17 files changed, 49 insertions, 48 deletions

diff --git a/bootscripts/contrib/lsb-v3/init.d/checkfs b/bootscripts/contrib/lsb-v3/init.d/checkfs
index 739f71409..a7f125708 100644
--- a/bootscripts/contrib/lsb-v3/init.d/checkfs
+++ b/bootscripts/contrib/lsb-v3/init.d/checkfs
@@ -7,7 +7,7 @@
 # Should-Start:
 # Required-Stop:
 # Should-Stop:
-# Default-Start:       sysinit
+# Default-Start:       S
 # Default-Stop:
 # Short-Description:   Checks local filesystems before mounting.
 # Description:         Checks local filesystmes before mounting.
diff --git a/bootscripts/contrib/lsb-v3/init.d/cleanfs b/bootscripts/contrib/lsb-v3/init.d/cleanfs
index b160fbc22..b702eefbd 100644
--- a/bootscripts/contrib/lsb-v3/init.d/cleanfs
+++ b/bootscripts/contrib/lsb-v3/init.d/cleanfs
@@ -7,7 +7,7 @@
 # Should-Start:
 # Required-Stop:
 # Should-Stop:
-# Default-Start:       sysinit
+# Default-Start:       S
 # Default-Stop:        
 # Short-Description:   Cleans temporary directories early in the boot process.
 # Description:         Cleans temporary directories /var/run, /var/lock, and
diff --git a/bootscripts/contrib/lsb-v3/init.d/console b/bootscripts/contrib/lsb-v3/init.d/console
index 87e392378..071750125 100644
--- a/bootscripts/contrib/lsb-v3/init.d/console
+++ b/bootscripts/contrib/lsb-v3/init.d/console
@@ -7,7 +7,7 @@
 # Should-Start:        $local_fs
 # Required-Stop:
 # Should-Stop:
-# Default-Start:       sysinit
+# Default-Start:       S
 # Default-Stop:
 # Short-Description:   Sets up a localised console.
 # Description:         Sets up fonts and language settings for the user's 
diff --git a/bootscripts/contrib/lsb-v3/init.d/lfs-functions b/bootscripts/contrib/lsb-v3/init.d/lfs-functions
index 34dfeefdc..afcd05de8 100644
--- a/bootscripts/contrib/lsb-v3/init.d/lfs-functions
+++ b/bootscripts/contrib/lsb-v3/init.d/lfs-functions
@@ -80,7 +80,6 @@ statusproc()
     if [ "${STATUS}" = "0" ]; then
         log_success_msg "Running with PID(s) ${pidlist}"
     else
-        
         log_warning_msg "Not running!"
     fi
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/localnet b/bootscripts/contrib/lsb-v3/init.d/localnet
index 4baf03ffe..6dae531a0 100644
--- a/bootscripts/contrib/lsb-v3/init.d/localnet
+++ b/bootscripts/contrib/lsb-v3/init.d/localnet
@@ -6,9 +6,9 @@
 # Required-Start:      $local_fs
 # Should-Start:
 # Required-Stop:
-# Should-Stop:         halt reboot
-# Default-Start:       sysinit 0 6
-# Default-Stop:
+# Should-Stop:
+# Default-Start:       S
+# Default-Stop:        0 6
 # Short-Description:   Starts the local network.
 # Description:         Sets the hostname of the machine and starts the 
 #                      loopback interface.
diff --git a/bootscripts/contrib/lsb-v3/init.d/modules b/bootscripts/contrib/lsb-v3/init.d/modules
index d5e1ad646..35cb9f2d4 100644
--- a/bootscripts/contrib/lsb-v3/init.d/modules
+++ b/bootscripts/contrib/lsb-v3/init.d/modules
@@ -3,11 +3,11 @@
 
 ### BEGIN INIT INFO
 # Provides:            modules
-# Required-Start:      mountkernfs
-# Should-Start:        sysctl
+# Required-Start:      mountkernfs sysctl
+# Should-Start:
 # Required-Stop:
 # Should-Stop:
-# Default-Start:       sysinit
+# Default-Start:       S
 # Default-Stop:
 # Short-Description:   Loads required modules.
 # Description:         Loads modules listed in /etc/sysconfig/modules.
diff --git a/bootscripts/contrib/lsb-v3/init.d/mountfs b/bootscripts/contrib/lsb-v3/init.d/mountfs
index e1eca5fb5..41fc41d68 100644
--- a/bootscripts/contrib/lsb-v3/init.d/mountfs
+++ b/bootscripts/contrib/lsb-v3/init.d/mountfs
@@ -5,14 +5,14 @@
 # Provides:            $local_fs
 # Required-Start:      udev checkfs
 # Should-Start:
-# Required-Stop:       swap
+# Required-Stop:       localnet
 # Should-Stop:
-# Default-Start:       sysinit 0 6
-# Default-Stop:
-# Short-Description:   Mounts and unmounts all local filesystems.
+# Default-Start:       S
+# Default-Stop:        0 6
+# Short-Description:   Mounts/unmounts local filesystems defined in /etc/fstab.
 # Description:         Remounts root filesystem read/write and mounts all
 #                      remaining local filesystems defined in /etc/fstab on
-#                      start.  Rmounts root filesystem read-only and unmounts
+#                      start.  Remounts root filesystem read-only and unmounts
 #                      remaining filesystems on stop.
 # X-LFS-Default-Start: S40
 # X-LFS-Default-Stop:  S70
diff --git a/bootscripts/contrib/lsb-v3/init.d/mountkernfs b/bootscripts/contrib/lsb-v3/init.d/mountkernfs
index 6362b3db9..aa985b976 100644
--- a/bootscripts/contrib/lsb-v3/init.d/mountkernfs
+++ b/bootscripts/contrib/lsb-v3/init.d/mountkernfs
@@ -7,7 +7,7 @@
 # Should-Start:
 # Required-Stop:
 # Should-Stop:
-# Default-Start:       sysinit
+# Default-Start:       S
 # Default-Stop:
 # Short-Description:   Mounts /sys and /proc virtual (kernel) filesystems.
 # Description:         Mounts /sys and /proc virtual (kernel) filesystems.
diff --git a/bootscripts/contrib/lsb-v3/init.d/network b/bootscripts/contrib/lsb-v3/init.d/network
index efcdd950a..f3cecc9fb 100644
--- a/bootscripts/contrib/lsb-v3/init.d/network
+++ b/bootscripts/contrib/lsb-v3/init.d/network
@@ -6,7 +6,7 @@
 # Required-Start:      $syslog
 # Should-Start:
 # Required-Stop:       $syslog $local_fs swap localnet 
-# Should-Stop:         halt reboot
+# Should-Stop:
 # Default-Start:       3 4 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   Starts and configures network interfaces.
@@ -31,7 +31,6 @@ case "${1}" in
 			then
 				continue
 			fi
-
 			IN_BOOT=1 ${NETWORK_DEVICES}/ifup ${interface}
 		done
 		;;
diff --git a/bootscripts/contrib/lsb-v3/init.d/rc b/bootscripts/contrib/lsb-v3/init.d/rc
index c9a0aa51e..75ddf8951 100644
--- a/bootscripts/contrib/lsb-v3/init.d/rc
+++ b/bootscripts/contrib/lsb-v3/init.d/rc
@@ -15,7 +15,7 @@ if [ "${#}" -ne 1 ]; then
 fi
 
 # Do not use the RUNLEVEL and PREVLEVEL variables provided by init so 
-# that they can be modified and alternate directories (sysinit) can 
+# that they can be modified and alternate directories (S) can 
 # be used without affecting init
 runlevel="${1}"
 prevlevel="${PREVLEVEL}"
@@ -26,12 +26,12 @@ if [ "${prevlevel}" = "" ]; then
 fi
 
 # Mount a tmpfs to store boot accounting information
-if [ "${runlevel}" = "sysinit" -a "${TEMPFS_MOUNT}" != "" ]; then
+if [ "${runlevel}" = "S" -a "${TEMPFS_MOUNT}" != "" ]; then
     mount -n -t tmpfs tmpfs "${TEMPFS_MOUNT}" -o mode=600
 fi
 
 # Provide an interactive prompt (if requested)
-if [ "${runlevel}" = "sysinit" -a "${iprompt}" = "yes" ]; then
+if [ "${runlevel}" = "S" -a "${iprompt}" = "yes" ]; then
     # ash does not accept t and n flags for read
     ls -l /bin/sh | grep "/ash"
     if [ "${?}" -eq "0" ]; then
@@ -66,12 +66,12 @@ if [ ! -d "${RC_BASE}/rc${runlevel}.d" ]; then
 fi
 
 # Source the interactive state file if it exists
-if [ "${runlevel}" != "sysinit" -a -f "${TEMPFS_MOUNT}/.interactive-start" ]; then
+if [ "${runlevel}" != "S" -a -f "${TEMPFS_MOUNT}/.interactive-start" ]; then
     . "${TEMPFS_MOUNT}/.interactive-start"
 fi
 
-# Prompt for interactive startup after completing sysinit
-if [ "${interactive}" = "I" -a "${runlevel}" != "sysinit" -a \
+# Prompt for interactive startup after completing S
+if [ "${interactive}" = "I" -a "${runlevel}" != "S" -a \
     "${runlevel}" != "0" -a "${runlevel}" != "6" ]; then
     echo -n -e "Proceed with interactive starup of runlevel "
     echo -n -e "${INFO}${runlevel}${NORMAL}?"
@@ -104,10 +104,10 @@ if [ "${prevlevel}" != "N" ]; then
 
         script=${link#$RC_BASE/rc$runlevel.d/K[0-9][0-9]}
         prev_start=$RC_BASE/rc$prevlevel.d/S[0-9][0-9]$script
-        sysinit_start=$RC_BASE/rcsysinit.d/S[0-9][0-9]$script
+        S_start=$RC_BASE/rcS.d/S[0-9][0-9]$script
 
         if [ "${runlevel}" != "0" -a "${runlevel}" != "6" ]; then
-            if [ ! -f ${prev_start} ] && [ ! -f ${sysinit_start} ]; then
+            if [ ! -f ${prev_start} ] && [ ! -f ${S_start} ]; then
                 echo -e -n "${WARNING}WARNING:\n\n${link} can't be"
                 echo -e "${WARNING} executed because it was not"
                 echo -e -n "${WARNING} not started in the previous"
@@ -180,14 +180,17 @@ done
 
 # Strip apply time to the logs, strip out any color codes and dump 
 # the log to /var/log/boot.log
-if [ -f "${TEMPFS_MOUNT}/.bootlog" -a "${runlevel}" != "sysinit" ]; then
+if [ -f "${TEMPFS_MOUNT}/.bootlog" -a "${runlevel}" != "S" ]; then
     # Remove any color codes from the temp log file
     sed -i 's@\\033\[[0-9];[0-9][0-9]m@@g' "${TEMPFS_MOUNT}/.bootlog"
     #Fix the time and hostname
     BTIMESPEC=$(echo `date +"%b %d %T"` `hostname`)
     sed -i "s@^bootlog:@${BTIMESPEC} bootlog:@" "${TEMPFS_MOUNT}/.bootlog"
-    cat "${TEMPFS_MOUNT}/.bootlog" >> /var/log/boot.log
-    rm -f "${TEMPFS_MOUNT}/.bootlog"
+    # Don't try and write in 0 and 6, this is a 'boot' log
+    if [ "${runlevel}" != "0" -a "${runlevel}" != "6" ]; then
+        cat "${TEMPFS_MOUNT}/.bootlog" >> /var/log/boot.log
+        rm -f "${TEMPFS_MOUNT}/.bootlog"
+    fi
 fi
 
 # End $RC_BASE/init.d/rc
diff --git a/bootscripts/contrib/lsb-v3/init.d/sendsignals b/bootscripts/contrib/lsb-v3/init.d/sendsignals
index f0ac4032b..e48e19fb7 100644
--- a/bootscripts/contrib/lsb-v3/init.d/sendsignals
+++ b/bootscripts/contrib/lsb-v3/init.d/sendsignals
@@ -6,9 +6,9 @@
 # Required-Start:
 # Should-Start:
 # Required-Stop:       $local_fs swap localnet
-# Should-Stop:         halt reboot
-# Default-Start:       0 6
-# Default-Stop:
+# Should-Stop:
+# Default-Start:
+# Default-Stop:        0 6
 # Short-Description:   Attempts to kill remaining processes.
 # Description:         Attempts to kill remaining processes.
 # X-LFS-Default-Start:
diff --git a/bootscripts/contrib/lsb-v3/init.d/setclock b/bootscripts/contrib/lsb-v3/init.d/setclock
index 05e974a7a..f9cf7a64e 100644
--- a/bootscripts/contrib/lsb-v3/init.d/setclock
+++ b/bootscripts/contrib/lsb-v3/init.d/setclock
@@ -3,12 +3,12 @@
 
 ### BEGIN INIT INFO
 # Provides:            $time
-# Required-Start:      udev swap
+# Required-Start:      modules
 # Should-Start:
-# Required-Stop:       $network $syslog $local_fs
-# Should-Stop:         halt reboot
-# Default-Start:       sysinit
-# Default-Stop:        
+# Required-Stop:       $syslog
+# Should-Stop:
+# Default-Start:       S
+# Default-Stop: 
 # Short-Description:   Stores and restores time from the hardware clock
 # Description:         On boot, system time is obtained from hwclock.  The
 #                      hardware clock can also be set on shutdown.
diff --git a/bootscripts/contrib/lsb-v3/init.d/swap b/bootscripts/contrib/lsb-v3/init.d/swap
index e846e2e9f..34f7a5a5e 100644
--- a/bootscripts/contrib/lsb-v3/init.d/swap
+++ b/bootscripts/contrib/lsb-v3/init.d/swap
@@ -3,12 +3,12 @@
 
 ### BEGIN INIT INFO
 # Provides:            swap
-# Required-Start:      udev
+# Required-Start:      modules
 # Should-Start:
 # Required-Stop:       localnet
-# Should-Stop:         halt reboot
-# Default-Start:       sysinit 0 6
-# Default-Stop:
+# Should-Stop:
+# Default-Start:       S
+# Default-Stop:        0 6
 # Short-Description:   Mounts and unmounts swap partitions.
 # Description:         Mounts and unmounts swap partitions defined in 
 #                      /etc/fstab.
diff --git a/bootscripts/contrib/lsb-v3/init.d/sysctl b/bootscripts/contrib/lsb-v3/init.d/sysctl
index ae9efb8f5..cbae2408b 100644
--- a/bootscripts/contrib/lsb-v3/init.d/sysctl
+++ b/bootscripts/contrib/lsb-v3/init.d/sysctl
@@ -3,11 +3,11 @@
 
 ### BEGIN INIT INFO
 # Provides:            sysctl
-# Required-Start:      udev
+# Required-Start:      mountkernfs
 # Should-Start:
 # Required-Stop:
 # Should-Stop:
-# Default-Start:       sysinit
+# Default-Start:       S
 # Default-Stop:
 # Short-Description:   Makes changes to the proc filesystem
 # Description:         Makes changes to the proc filesystem as defined in
diff --git a/bootscripts/contrib/lsb-v3/init.d/sysklogd b/bootscripts/contrib/lsb-v3/init.d/sysklogd
index 8a8280e31..cdfd9641e 100644
--- a/bootscripts/contrib/lsb-v3/init.d/sysklogd
+++ b/bootscripts/contrib/lsb-v3/init.d/sysklogd
@@ -5,8 +5,8 @@
 # Provides:            $syslog
 # Required-Start:      localnet
 # Should-Start:
-# Required-Stop:       sendsignals $local_fs swap
-# Should-Stop:         halt reboot
+# Required-Stop:       $local_fs
+# Should-Stop:
 # Default-Start:       2 3 4 5
 # Default-Stop:        0 1 6
 # Short-Description:   Starts kernel and system log daemons.
diff --git a/bootscripts/contrib/lsb-v3/init.d/udev b/bootscripts/contrib/lsb-v3/init.d/udev
index 1aa80a3ef..b7918a47b 100644
--- a/bootscripts/contrib/lsb-v3/init.d/udev
+++ b/bootscripts/contrib/lsb-v3/init.d/udev
@@ -3,11 +3,11 @@
 
 ### BEGIN INIT INFO
 # Provides:            udev
-# Required-Start:      mountkernfs
+# Required-Start:      modules
 # Should-Start:
 # Required-Stop:
 # Should-Stop:
-# Default-Start:       sysinit
+# Default-Start:       S
 # Default-Stop:
 # Short-Description:   Populated /dev with device nodes.
 # Description:         Mounts a tempfs on /dev and starts the udevd daemon.
diff --git a/bootscripts/contrib/lsb-v3/init.d/udev_retry b/bootscripts/contrib/lsb-v3/init.d/udev_retry
index b87a7b3e9..df70132eb 100644
--- a/bootscripts/contrib/lsb-v3/init.d/udev_retry
+++ b/bootscripts/contrib/lsb-v3/init.d/udev_retry
@@ -7,7 +7,7 @@
 # Should-Start:        $local_fs
 # Required-Stop:
 # Should-Stop:
-# Default-Start:       sysinit
+# Default-Start:       S
 # Default-Stop:
 # Short-Description:   Replays failed uevents and creates additonal devices.
 # Description:         Replays any failed uevents that were skipped due to