Changeset 642e2e9 for bootscripts/lfs

Timestamp:

11/28/2011 08:13:36 AM (12 years ago)

Author:

DJ Lucas <dj@…>

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:

d53a9b7

Parents:

17698aa

Message:

Various cosmetic fixes for bootscripts

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

Location:

bootscripts/lfs

Files:

• init.d/mountfs (modified) (1 diff)
• init.d/mountvirtfs (modified) (1 diff)
• init.d/rc (modified) (1 diff)
• init.d/setclock (modified) (1 diff)
• init.d/udev (modified) (1 diff)
• init.d/udev_retry (modified) (1 diff)
• lib/services/init-functions (modified) (1 diff)
• sbin/ifup (modified) (1 diff)

bootscripts/lfs/init.d/mountfs

@@ -62 +62 @@
       # 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

bootscripts/lfs/init.d/mountvirtfs

@@ -37 +37 @@
       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

bootscripts/lfs/init.d/rc

@@ -112 +112 @@
 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.

bootscripts/lfs/init.d/setclock

@@ -45 +45 @@
 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
       ;;
 

bootscripts/lfs/init.d/udev

@@ -85 +85 @@
       # Now wait for udevd to process the uevents we triggered
       /sbin/udevadm settle
-      #log_success_msg2 
+      log_success_msg2 
       ;;
 

bootscripts/lfs/init.d/udev_retry

@@ -57 +57 @@
       # Now wait for udevd to process the uevents we triggered
       /sbin/udevadm settle
-      #evaluate_retval
+      evaluate_retval
       ;;
 

bootscripts/lfs/lib/services/init-functions

@@ -62 +62 @@
 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="     "

bootscripts/lfs/sbin/ifup

@@ -56 +56 @@
 . /lib/lsb/init-functions
 
-log_info_msg "Bringing up the ${1} interface... "
+log_info_msg "Bringing up the ${1} interface: "
 
 if [ ! -r "${file}" ]; then