Changeset bd899fb for bootscripts/lfs/lib

Timestamp:

01/27/2012 08:39:49 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, 12.2, 12.2-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/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

bb75f17

Parents:

661b744

Message:

Update scripts to support BLFS bridge devices.
Cosmetic cleanups

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

Location:

bootscripts/lfs/lib/services

Files:

• init-functions (modified) (6 diffs)
• ipv4-static (modified) (3 diffs)

bootscripts/lfs/lib/services/init-functions

@@ -68 +68 @@
 WARNING_PREFIX="${WARNING} *** ${NORMAL}"
 
+SUCCESS_SUFFIX="${BRACKET}[${SUCCESS}  OK  ${BRACKET}]${NORMAL}"
+FAILURE_SUFFIX="${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}"
+WARNING_SUFFIX="${BRACKET}[${WARNING} WARN ${BRACKET}]${NORMAL}"
+
 BOOTLOG=/run/var/bootlog
 KILLDELAY=3
@@ -568 +572 @@
 {
     echo -n -e "${BMPREFIX}${@}"
-    echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]${NORMAL}"
+    echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
 
     # Strip non-printable characters from log file
@@ -582 +586 @@
 {
     echo -n -e "${BMPREFIX}${@}"
-    echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]${NORMAL}"
+    echo -e "${CURS_ZERO}${SUCCESS_PREFIX}${SET_COL}${SUCCESS_SUFFIX}"
 
     echo " OK" >> ${BOOTLOG}
@@ -603 +607 @@
 {
     echo -n -e "${BMPREFIX}${@}"
-    echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}"
+    echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
 
     # Strip non-printable characters from log file
@@ -617 +621 @@
 {
     echo -n -e "${BMPREFIX}${@}"
-    echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]${NORMAL}"
+    echo -e "${CURS_ZERO}${FAILURE_PREFIX}${SET_COL}${FAILURE_SUFFIX}"
 
     echo "FAIL" >> ${BOOTLOG}
@@ -636 +640 @@
 {
     echo -n -e "${BMPREFIX}${@}"
-    echo -e "${CURS_ZERO}${WARNING_PREFIX}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]${NORMAL}"
+    echo -e "${CURS_ZERO}${WARNING_PREFIX}${SET_COL}${WARNING_SUFFIX}"
 
     # Strip non-printable characters from log file

bootscripts/lfs/lib/services/ipv4-static

@@ -43 +43 @@
 case "${2}" in
    up)
-      if [ "$(ip addr show ${1} | grep ${IP})" == "" ]; then
-         log_info_msg2 "\n" # Terminate the previous message
+      if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP})" == "" ]; then
+         
+         # Cosmetic output not needed for multiple services
+         if ! $(echo ${SERVICE} | grep -q " "); then 
+           log_info_msg2 "\n" # Terminate the previous message
+         fi
+         
          log_info_msg "Adding IPv4 address ${IP} to the ${1} interface..."
          ip addr add ${args} dev ${1}
@@ -65 +70 @@
 
    down)
-      if [ "$(ip addr show ${1} | grep ${IP})" != "" ]; then
+      if [ "$(ip addr show ${1} 2>/dev/null | grep ${IP})" != "" ]; then
          log_info_msg "Removing IPv4 address ${IP} from the ${1} interface..."
          ip addr del ${args} dev ${1}
@@ -73 +78 @@
       if [ -n "${GATEWAY}" ]; then
          # Only remove the gateway if ther are no remaining ipv4 addresses
-         if [ "$(ip addr show ${1} | grep 'inet ')" != "" ]; then
+         if [ "$(ip addr show ${1} 2>/dev/null | grep 'inet ')" != "" ]; then
             log_info_msg "Removing default gateway..."
             ip route del default