Changeset 010d108 for bootscripts/contrib/lsb-v3/init.d/rc

Timestamp:

08/31/2008 06:24:27 AM (16 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 12.2, 12.2-rc1, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

1e6b6d5

Parents:

59dc6e1

Message:

See contrib/lsb-v3/ChangeLog

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

File:

• bootscripts/contrib/lsb-v3/init.d/rc (modified) (6 diffs)

bootscripts/contrib/lsb-v3/init.d/rc

@@ -16 +16 @@
 
 # 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}"
@@ -27 +27 @@
 
 # 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"
@@ -67 +67 @@
 
 # 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 "
@@ -105 +105 @@
         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"
@@ -181 +181 @@
 # 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"
@@ -187 +187 @@
     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