Changeset 85ce884e for bootscripts

Timestamp:

10/14/2012 12:10:34 AM (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.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:

2cddf899

Parents:

12574f2

Message:

Include some omitted boot script changes

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

Location:

bootscripts/lfs/init.d

Files:

• checkfs (modified) (3 diffs)
• udev (modified) (1 diff)
• udev_retry (modified) (1 diff)

bootscripts/lfs/init.d/checkfs

@@ -47 +47 @@
          msg="${msg} file system checks as requested.\n"
          log_info_msg "${msg}"
-         rm /fastboot
          exit 0
       fi
@@ -75 +74 @@
          log_success_msg "$msg"
          options="-f"
-         rm /forcefsck
       else
          options=""
@@ -81 +79 @@
 
       log_info_msg "Checking file systems..."
-      
       # Note: -a option used to be -p; but this fails e.g. on fsck.minix
       if is_true "$VERBOSE_FSCK"; then
-         fsck ${options} -a -A -C -T
+        fsck ${options} -a -A -C -T
       else
-         fsck ${options} -a -A -C -T >/dev/null
+        fsck ${options} -a -A -C -T >/dev/null
       fi
 

bootscripts/lfs/init.d/udev

@@ -59 +59 @@
 
       # Now wait for udevd to process the uevents we triggered
-      /sbin/udevadm settle
+      if ! is_true "$OMIT_UDEV_SETTLE"; then
+         /sbin/udevadm settle
+      fi
 
       # If any LVM based partitions are on the system, ensure they

bootscripts/lfs/init.d/udev_retry

@@ -58 +58 @@
 
       # Now wait for udevd to process the uevents we triggered
-      /sbin/udevadm settle
+      if ! is_true "$OMIT_UDEV_RETRY_SETTLE"; then
+         /sbin/udevadm settle
+      fi
+
       evaluate_retval
       ;;