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

1 files changed, 20 insertions, 24 deletions

diff --git a/bootscripts/lfs/init.d/functions b/bootscripts/lfs/init.d/functions
index e91ce5b5a..c9dbcef89 100644
--- a/bootscripts/lfs/init.d/functions
+++ b/bootscripts/lfs/init.d/functions
@@ -136,36 +136,36 @@ echo_ok()
 {
    ${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
 }
 
 echo_failure()
 {
    ${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
 }
 
 echo_warning()
 {
    ${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
 }
 
 echo_skipped()
 {
    ${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
 }
 
 wait_for_user()
@@ -713,9 +713,8 @@ log_success_msg()
 {
    ${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
 }
 
@@ -736,9 +735,8 @@ log_success_msg()
 log_failure_msg() {
    ${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
 }
 
@@ -759,9 +757,8 @@ log_failure_msg() {
 log_warning_msg() {
    ${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
 }
 
@@ -782,9 +779,8 @@ log_warning_msg() {
 log_skipped_msg() {
    ${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
 }