Changeset a2e555d for bootscripts

Timestamp:

08/02/2011 04:28:02 PM (13 years ago)

Author:

Bruce Dubbs <bdubbs@…>

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

Children:

a55002a

Parents:

0cda898

Message:

Add /etc/sysconfig to Creating Directories
Update boot logging to remove terminal escape sequences

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

File:

• bootscripts/lfs/init.d/functions (modified) (8 diffs)

bootscripts/lfs/init.d/functions

@@ -137 +137 @@
    ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]"
    ${ECHO} -e "${NORMAL}"
-        boot_mesg_flush
-   ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]" >> /run/var/bootlog
-   ${ECHO} -e "${NORMAL}" >> /run/var/bootlog
+   boot_mesg_flush
+
+   ${ECHO} -e "[ OK ]" >> /run/var/bootlog
 }
 
@@ -146 +146 @@
    ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]"
    ${ECHO} -e "${NORMAL}"
-        boot_mesg_flush
-   ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]" >> /run/var/bootlog
-   ${ECHO} -e "${NORMAL}" >> /run/var/bootlog
+    boot_mesg_flush
+
+   ${ECHO} -e "[ FAIL]"  >> /run/var/bootlog
 }
 
@@ -155 +155 @@
    ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]"
    ${ECHO} -e "${NORMAL}"
-        boot_mesg_flush
-   ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]" >> /run/var/bootlog
-   ${ECHO} -e "${NORMAL}" >> /run/var/bootlog
+   boot_mesg_flush
+
+   ${ECHO} -e "[ WARN ]"  >> /run/var/bootlog
 }
 
@@ -164 +164 @@
    ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} SKIP ${BRACKET}]"
    ${ECHO} -e "${NORMAL}"
-        boot_mesg_flush
-   ${ECHO} -n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} SKIP ${BRACKET}]" >> /run/var/bootlog
-   ${ECHO} -e "${NORMAL}" >> /run/var/bootlog
+   boot_mesg_flush
+
+   ${ECHO} -e "  [ SKIP ]" >> /run/var/bootlog
 }
 
@@ -714 +714 @@
    ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
    ${ECHO} -e "${SET_COL}""${BRACKET}""[""${SUCCESS}""  OK  ""${BRACKET}""]""${NORMAL}"
-   ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}" >> /run/var/bootlog
-   ${ECHO} -e "${SET_COL}""${BRACKET}""[""${SUCCESS}""  OK  ""${BRACKET}""]""${NORMAL}" \
-         >> /run/var/bootlog
+
+   ${ECHO} -n -e "${@}  [ OK ]"  >> /run/var/bootlog
    return 0
 }
@@ -737 +736 @@
    ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
    ${ECHO} -e "${SET_COL}""${BRACKET}""[""${FAILURE}"" FAIL ""${BRACKET}""]""${NORMAL}"
-   ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}" >> /run/var/bootlog
-   ${ECHO} -e "${SET_COL}""${BRACKET}""[""${FAILURE}"" FAIL ""${BRACKET}""]""${NORMAL}" \
-         >> /run/var/bootlog
+
+   ${ECHO} -e "${@}  [ FAIL ]" >> /run/var/bootlog
    return 0
 }
@@ -760 +758 @@
    ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
    ${ECHO} -e "${SET_COL}""${BRACKET}""[""${WARNING}"" WARN ""${BRACKET}""]""${NORMAL}"
-   ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}" >> /run/var/bootlog
-   ${ECHO} -e "${SET_COL}""${BRACKET}""[""${WARNING}"" WARN ""${BRACKET}""]""${NORMAL}" \
-         >> /run/var/bootlog
+
+   ${ECHO} -e "${@}  [ WARN ]" >> /run/var/bootlog
    return 0
 }
@@ -783 +780 @@
    ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}"
    ${ECHO} -e "${SET_COL}""${BRACKET}""[""${WARNING}"" SKIP ""${BRACKET}""]""${NORMAL}"
-   ${ECHO} -n -e "${BOOTMESG_PREFIX}${@}" >> /run/var/bootlog
-   ${ECHO} -e "${SET_COL}""${BRACKET}""[""${WARNING}"" SKIP ""${BRACKET}""]""${NORMAL}" \
-         >> /run/var/bootlog
+
+   ${ECHO} -e "${@}  [ SKIP ]" >> /run/var/bootlog
    return 0
 }