[lfs-book] r9673 - in trunk/BOOK/bootscripts: . lfs/init.d lfs/lib/services lfs/sbin

dj at linuxfromscratch.org dj at linuxfromscratch.org
Mon Nov 28 00:13:46 PST 2011


Author: dj
Date: 2011-11-28 01:13:36 -0700 (Mon, 28 Nov 2011)
New Revision: 9673

Modified:
   trunk/BOOK/bootscripts/ChangeLog
   trunk/BOOK/bootscripts/lfs/init.d/mountfs
   trunk/BOOK/bootscripts/lfs/init.d/mountvirtfs
   trunk/BOOK/bootscripts/lfs/init.d/rc
   trunk/BOOK/bootscripts/lfs/init.d/setclock
   trunk/BOOK/bootscripts/lfs/init.d/udev
   trunk/BOOK/bootscripts/lfs/init.d/udev_retry
   trunk/BOOK/bootscripts/lfs/lib/services/init-functions
   trunk/BOOK/bootscripts/lfs/sbin/ifup
Log:
Various cosmetic fixes for bootscripts

Modified: trunk/BOOK/bootscripts/ChangeLog
===================================================================
--- trunk/BOOK/bootscripts/ChangeLog	2011-11-27 02:14:12 UTC (rev 9672)
+++ trunk/BOOK/bootscripts/ChangeLog	2011-11-28 08:13:36 UTC (rev 9673)
@@ -1,3 +1,13 @@
+2011-11-28  DJ Lucas <dj at 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 at linuxfromscratch.org>
 
    * The following are from suggestions by DJ Lucas

Modified: trunk/BOOK/bootscripts/lfs/init.d/mountfs
===================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/mountfs	2011-11-27 02:14:12 UTC (rev 9672)
+++ trunk/BOOK/bootscripts/lfs/init.d/mountfs	2011-11-28 08:13:36 UTC (rev 9673)
@@ -61,7 +61,7 @@
    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
       ;;

Modified: trunk/BOOK/bootscripts/lfs/init.d/mountvirtfs
===================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/mountvirtfs	2011-11-27 02:14:12 UTC (rev 9672)
+++ trunk/BOOK/bootscripts/lfs/init.d/mountvirtfs	2011-11-28 08:13:36 UTC (rev 9673)
@@ -36,7 +36,7 @@
       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"

Modified: trunk/BOOK/bootscripts/lfs/init.d/rc
===================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/rc	2011-11-27 02:14:12 UTC (rev 9672)
+++ trunk/BOOK/bootscripts/lfs/init.d/rc	2011-11-28 08:13:36 UTC (rev 9673)
@@ -111,7 +111,7 @@
 # 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.
 

Modified: trunk/BOOK/bootscripts/lfs/init.d/setclock
===================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/setclock	2011-11-27 02:14:12 UTC (rev 9672)
+++ trunk/BOOK/bootscripts/lfs/init.d/setclock	2011-11-28 08:13:36 UTC (rev 9673)
@@ -44,10 +44,7 @@
 
 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)

Modified: trunk/BOOK/bootscripts/lfs/init.d/udev
===================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/udev	2011-11-27 02:14:12 UTC (rev 9672)
+++ trunk/BOOK/bootscripts/lfs/init.d/udev	2011-11-28 08:13:36 UTC (rev 9673)
@@ -84,7 +84,7 @@
 
       # Now wait for udevd to process the uevents we triggered
       /sbin/udevadm settle
-      #log_success_msg2 
+      log_success_msg2 
       ;;
 
    *)

Modified: trunk/BOOK/bootscripts/lfs/init.d/udev_retry
===================================================================
--- trunk/BOOK/bootscripts/lfs/init.d/udev_retry	2011-11-27 02:14:12 UTC (rev 9672)
+++ trunk/BOOK/bootscripts/lfs/init.d/udev_retry	2011-11-28 08:13:36 UTC (rev 9673)
@@ -56,7 +56,7 @@
 
       # Now wait for udevd to process the uevents we triggered
       /sbin/udevadm settle
-      #evaluate_retval
+      evaluate_retval
       ;;
 
    *)

Modified: trunk/BOOK/bootscripts/lfs/lib/services/init-functions
===================================================================
--- trunk/BOOK/bootscripts/lfs/lib/services/init-functions	2011-11-27 02:14:12 UTC (rev 9672)
+++ trunk/BOOK/bootscripts/lfs/lib/services/init-functions	2011-11-28 08:13:36 UTC (rev 9673)
@@ -61,6 +61,11 @@
 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 at 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}"

Modified: trunk/BOOK/bootscripts/lfs/sbin/ifup
===================================================================
--- trunk/BOOK/bootscripts/lfs/sbin/ifup	2011-11-27 02:14:12 UTC (rev 9672)
+++ trunk/BOOK/bootscripts/lfs/sbin/ifup	2011-11-28 08:13:36 UTC (rev 9673)
@@ -55,7 +55,7 @@
 
 . /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." 




More information about the lfs-book mailing list