Changeset d4c8dce4 for bootscripts/lfs/init.d/rc

Timestamp:

09/15/2021 07:24:40 AM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

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, arm, bdubbs/gcc13, 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/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

9af096e

Parents:

df1207e (diff), 06e7b361 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into plabs/condxml

File:

• bootscripts/lfs/init.d/rc (modified) (5 diffs)

bootscripts/lfs/init.d/rc

@@ -19 +19 @@
    log_failure_msg
    # $i is set when called
-   MSG="FAILURE:\n\nYou should not be reading this error message.\n\n" 
+   MSG="FAILURE:\n\nYou should not be reading this error message.\n\n"
    MSG="${MSG}It means that an unforeseen error took place in\n"
    MSG="${MSG}${i},\n"
    MSG="${MSG}which exited with a return value of ${error_value}.\n"
-  
+
    MSG="${MSG}If you're able to track this error down to a bug in one of\n"
    MSG="${MSG}the files provided by the ${DISTRO_MINI} book,\n"
@@ -37 +37 @@
    # $i is set when called
    if [ ! -f ${i} ]; then
-      log_warning_msg "${i} is not a valid symlink." 
+      log_warning_msg "${i} is not a valid symlink."
       SCRIPT_STAT="1"
    fi
@@ -103 +103 @@
 
 if [ ! -d /etc/rc.d/rc${runlevel}.d ]; then
-   log_info_msg "/etc/rc.d/rc${runlevel}.d does not exist.\n" 
+   log_info_msg "/etc/rc.d/rc${runlevel}.d does not exist.\n"
    exit 1
 fi
@@ -110 +110 @@
 
 # Note: In ${LOGLEVEL:-7}, it is ':' 'dash' '7', not minus 7
-if [ "$runlevel" == "S" ]; then 
-   [ -r /etc/sysconfig/console ] && source /etc/sysconfig/console 
-   dmesg -n "${LOGLEVEL:-7}" 
+if [ "$runlevel" == "S" ]; then
+   [ -r /etc/sysconfig/console ] && source /etc/sysconfig/console
+   dmesg -n "${LOGLEVEL:-7}"
 fi
 
@@ -226 +226 @@
 if [ "${previous}" == "N" -a  "${runlevel}" != "S" ]; then
    cat $BOOTLOG >> /var/log/boot.log
-      
+
    # Mark the end of boot
    echo "--------" >> /var/log/boot.log
-   
+
    # Remove the temporary file
    rm -f $BOOTLOG 2> /dev/null