Changeset 9813d5e3 for bootscripts/lfs/lib

Timestamp:

11/14/2011 08:40:06 PM (12 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.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:

a64fd5a

Parents:

b15d6da

Message:

Updates to boot scripts:

general cleanup;
move consolelog function to rc;
clean up boot logging functions;
fix interactive prompt between run level S and target run level.

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

File:

• bootscripts/lfs/lib/services/init-functions (modified) (12 diffs)

bootscripts/lfs/lib/services/init-functions

@@ -44 +44 @@
 SET_WCOL="\\033[${WCOL}G"    # at the $WCOL char
 CURS_UP="\\033[1A\\033[0G"   # Up one line, at the 0'th char
+CURS_ZERO="\\033[0G"
 
 ## Set color commands, used via echo
@@ -60 +61 @@
 INFO="\\033[1;36m"           # Information is light cyan
 BRACKET="\\033[1;34m"        # Brackets are blue
+
+# Use a colored prefix
+BMPREFIX="     "
+SUCCESS_PREFIX="${SUCCESS}  *  ${NORMAL}"
+FAILURE_PREFIX="${FAILURE}*****${NORMAL}"
+WARNING_PREFIX="${WARNING} *** ${NORMAL}"
 
 BOOTLOG=/run/var/bootlog
@@ -172 +179 @@
 
     # Do the start!
-
     nice -n "${nice}" "${@}"
 }
@@ -471 +477 @@
 #         pathname, path to the specified program                              #
 #                                                                              #
-# Note: Output to stdout.  Not logged.                                         #
-#                                                                              #
 # Return values:                                                               #
 #       0 - Status printed                                                     #
@@ -479 +483 @@
 statusproc()
 {
+   local pidfile
+   local pidlist
+
    if [ "${#}" = "0" ]; then
-      echo "Usage: statusproc {program}"
+      echo "Usage: [-p pidfle] statusproc {program}"
       exit 1
    fi
 
-    local pidfile
-    local pidlist
-
-    # Process arguments
-    while true; do
-      case "${1}" in
-
-          -p)
-              pidfile="${2}"
-              shift 2
-              ;;
-      esac
+   # Process arguments
+   while true; do
+       case "${1}" in
+
+           -p)
+               pidfile="${2}"
+               shift 2
+               ;;
+
+           *)
+               if [ -n "${2}" ]; then
+                   echo "Too many arguments"
+                   return 1
+               else
+                   break
+               fi
+               ;;
+       esac
    done
 
@@ -517 +530 @@
             "/var/run/${base}.pid exists.${NORMAL}"
       else
-         if [ -z "${pidlist}" -a -n "${pidfile}" ]; then
+         if [ -n "${pidfile}" -a -e "${pidfile}" ]; then
             echo -e "${WARNING}${1} is not running" \
                "but ${pidfile} exists.${NORMAL}"
@@ -554 +567 @@
 log_success_msg()
 {
-    echo -n -e "${@}"
-    echo -e "${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]${NORMAL}"
+    echo -n -e "${BMPREFIX}${@}"
+    echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]${NORMAL}"
+
+    # Strip non-printable characters from log file
+    local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
 
     timespec
-    echo -e "${STAMP} ${@} OK" >> ${BOOTLOG}
+    echo -e "${STAMP} ${logmessage} OK" >> ${BOOTLOG}
+    
     return 0
 }
@@ -564 +581 @@
 log_success_msg2()
 {
-    echo -n -e "${@}"
-    echo -e "${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]${NORMAL}"
+    echo -n -e "${BMPREFIX}${@}"
+    echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]${NORMAL}"
 
     echo " OK" >> ${BOOTLOG}
+    
     return 0
 }
@@ -584 +602 @@
 log_failure_msg()
 {
-    echo -n -e "${@}"
-    echo -e "${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}"
+    echo -n -e "${BMPREFIX}${@}"
+    echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}"
+
+    # Strip non-printable characters from log file
 
     timespec
-    echo -e "${STAMP} ${@} FAIL" >> ${BOOTLOG}
+    local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
+    echo -e "${STAMP} ${logmessage} FAIL" >> ${BOOTLOG}
+    
     return 0
 }
@@ -594 +616 @@
 log_failure_msg2()
 {
-    echo -n -e "${@}"
-    echo -e "${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}"
+    echo -n -e "${BMPREFIX}${@}"
+    echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}"
 
     echo "FAIL" >> ${BOOTLOG}
+    
     return 0
 }
@@ -612 +635 @@
 log_warning_msg()
 {
-    echo -n -e "${@}"
-    echo -e "${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]${NORMAL}"
-
+    echo -n -e "${BMPREFIX}${@}"
+    echo -e "${CURS_ZERO}${WARNING_PREFIX}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]${NORMAL}"
+
+    # Strip non-printable characters from log file
+    local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
     timespec
-    echo -e "${STAMP} ${@} WARN" >> ${BOOTLOG}
+    echo -e "${STAMP} ${logmessage} WARN" >> ${BOOTLOG}
+    
     return 0
 }
@@ -631 +657 @@
 log_info_msg()
 {
+    echo -n -e "${BMPREFIX}${@}"
+
+    # Strip non-printable characters from log file
+    local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
+    timespec
+    echo -n -e "${STAMP} ${logmessage}" >> ${BOOTLOG}
+    
+    return 0
+}
+
+log_info_msg2()
+{
     echo -n -e "${@}"
 
-    timespec
-    echo -n -e "${STAMP} ${@}" >> ${BOOTLOG}
-    return 0
-}
-
-log_info_msg2()
-{
-    echo -n -e "${@}"
-
-    echo -n -e "${@}" >> ${BOOTLOG}
+    # Strip non-printable characters from log file
+    local logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
+    echo -n -e "${logmessage}" >> ${BOOTLOG}
+    
     return 0
 }