Various cosmetic fixes for bootscripts

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

9 files changed, 21 insertions, 9 deletions

diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index de1755ec2..fa72d7e62 100644
--- a/bootscripts/ChangeLog
+++ b/bootscripts/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-28  DJ Lucas <dj@linuxfromscratch.org>
+
+   * lfs/init.d/mountfs: Add '-t nosysfs' to umount command
+   * lfs/init.d/mountvirtfs: remove unneeded spaces in output
+   * lfs/init.d/rc: Correct double interactive prompt
+   * lfs/init.d/setclock: Remove screen output from start case (udev)
+   * lfs/init.d/udev{,_retry}:  Restore output to screen and log
+   * lfs/lib/services/init-functions: Restore DISTRO variables
+   * lfs/sbin/ifup: Change "..." to ": " (not awaiting additonal output)
+
 2011-11-14  Bruce Dubbs <bdubbs@linuxfromscratch.org>
 
    * The following are from suggestions by DJ Lucas
diff --git a/bootscripts/lfs/init.d/mountfs b/bootscripts/lfs/init.d/mountfs
index 59d4300c5..4503836e1 100644
--- a/bootscripts/lfs/init.d/mountfs
+++ b/bootscripts/lfs/init.d/mountfs
@@ -61,7 +61,7 @@ case "${1}" in
    stop)
       # Don't unmount tmpfs like /run
       log_info_msg "Unmounting all other currently mounted file systems..."
-      umount -a -d -r -t notmpfs >/dev/null
+      umount -a -d -r -t notmpfs,nosysfs >/dev/null
       evaluate_retval
       exit 0
       ;;
diff --git a/bootscripts/lfs/init.d/mountvirtfs b/bootscripts/lfs/init.d/mountvirtfs
index ea32563f1..be6c8d0a0 100644
--- a/bootscripts/lfs/init.d/mountvirtfs
+++ b/bootscripts/lfs/init.d/mountvirtfs
@@ -36,7 +36,7 @@ case "${1}" in
       mount -n /run || failed=1
       mkdir -p /run/{var,lock,shm}
 
-      log_info_msg "Mounting virtual file systems:     ${INFO}/run" 
+      log_info_msg "Mounting virtual file systems: ${INFO}/run" 
 
       if ! mountpoint /proc >/dev/null; then
          log_info_msg2 " ${INFO}/proc"
diff --git a/bootscripts/lfs/init.d/rc b/bootscripts/lfs/init.d/rc
index 5aec5a257..cf01ba97e 100644
--- a/bootscripts/lfs/init.d/rc
+++ b/bootscripts/lfs/init.d/rc
@@ -111,7 +111,7 @@ if [ "$runlevel" == "6" -o "$runlevel" == "0" ]; then IPROMPT="no"; fi
 # Note: In ${LOGLEVEL:-7}, it is ':' 'dash' '7', not minus 7
 if [ "$runlevel" == "S" ]; then dmesg -n "${LOGLEVEL:-7}"; fi
 
-if [ "${IPROMPT}" == "yes" ]; then
+if [ "${IPROMPT}" == "yes" -a "${runlevel}" == "S" ]; then
    # dcol and icol are spaces before the message to center the
    # message on screen.
 
diff --git a/bootscripts/lfs/init.d/setclock b/bootscripts/lfs/init.d/setclock
index 12aaf032d..00345c84e 100644
--- a/bootscripts/lfs/init.d/setclock
+++ b/bootscripts/lfs/init.d/setclock
@@ -44,10 +44,7 @@ esac
 
 case ${1} in
    start)
-      log_info_msg2 "\n" # Run by udev, make sure start on new line
-      log_info_msg "Setting system clock..."
       hwclock --hctosys ${CLOCKPARAMS} >/dev/null
-      evaluate_retval
       ;;
 
    stop)
diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev
index 7e0e83ded..6b7a79bc6 100644
--- a/bootscripts/lfs/init.d/udev
+++ b/bootscripts/lfs/init.d/udev
@@ -84,7 +84,7 @@ case "${1}" in
 
       # Now wait for udevd to process the uevents we triggered
       /sbin/udevadm settle
-      #log_success_msg2 
+      log_success_msg2 
       ;;
 
    *)
diff --git a/bootscripts/lfs/init.d/udev_retry b/bootscripts/lfs/init.d/udev_retry
index 6d62adc40..4f258ac19 100644
--- a/bootscripts/lfs/init.d/udev_retry
+++ b/bootscripts/lfs/init.d/udev_retry
@@ -56,7 +56,7 @@ case "${1}" in
 
       # Now wait for udevd to process the uevents we triggered
       /sbin/udevadm settle
-      #evaluate_retval
+      evaluate_retval
       ;;
 
    *)
diff --git a/bootscripts/lfs/lib/services/init-functions b/bootscripts/lfs/lib/services/init-functions
index 9b200b414..47546338c 100644
--- a/bootscripts/lfs/lib/services/init-functions
+++ b/bootscripts/lfs/lib/services/init-functions
@@ -61,6 +61,11 @@ FAILURE="\\033[1;31m"        # Failures are red
 INFO="\\033[1;36m"           # Information is light cyan
 BRACKET="\\033[1;34m"        # Brackets are blue
 
+# Distro Information
+DISTRO="Linux From Scratch" # The distro name as displayed
+DISTRO_CONTACT="lfs-dev@linuxfromscratch.org" # Bug report address
+DISTRO_MINI="LFS" # Short name used in filenames for distro config
+
 # Use a colored prefix
 BMPREFIX="     "
 SUCCESS_PREFIX="${SUCCESS}  *  ${NORMAL}"
diff --git a/bootscripts/lfs/sbin/ifup b/bootscripts/lfs/sbin/ifup
index e808045f2..42afadfce 100755
--- a/bootscripts/lfs/sbin/ifup
+++ b/bootscripts/lfs/sbin/ifup
@@ -55,7 +55,7 @@ file=/etc/sysconfig/ifconfig.${1}
 
 . /lib/lsb/init-functions
 
-log_info_msg "Bringing up the ${1} interface... "
+log_info_msg "Bringing up the ${1} interface: "
 
 if [ ! -r "${file}" ]; then
    log_warning_msg "\n${file} is missing or cannot be accessed."