From 85ce884e4c411fab9b813e82fb816fe7170af309 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 14 Oct 2012 00:10:34 +0000
Subject: Include some omitted boot script changes

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10017 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 bootscripts/lfs/init.d/checkfs    | 7 ++-----
 bootscripts/lfs/init.d/udev       | 4 +++-
 bootscripts/lfs/init.d/udev_retry | 5 ++++-
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'bootscripts')

diff --git a/bootscripts/lfs/init.d/checkfs b/bootscripts/lfs/init.d/checkfs
index cd7904b5b..c711e4a9f 100644
--- a/bootscripts/lfs/init.d/checkfs
+++ b/bootscripts/lfs/init.d/checkfs
@@ -46,7 +46,6 @@ case "${1}" in
          msg="/fastboot found, will omit "
          msg="${msg} file system checks as requested.\n"
          log_info_msg "${msg}"
-         rm /fastboot
          exit 0
       fi
 
@@ -74,18 +73,16 @@ case "${1}" in
          msg="${msg} system checks as requested."
          log_success_msg "$msg"
          options="-f"
-         rm /forcefsck
       else
          options=""
       fi
 
       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
 
       error_value=${?}
diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev
index 78c48d753..739109cda 100644
--- a/bootscripts/lfs/init.d/udev
+++ b/bootscripts/lfs/init.d/udev
@@ -58,7 +58,9 @@ case "${1}" in
       /sbin/udevadm trigger --action=change --type=devices
 
       # 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
       # are activated so they can be used.
diff --git a/bootscripts/lfs/init.d/udev_retry b/bootscripts/lfs/init.d/udev_retry
index 1298eb95b..c921fc451 100644
--- a/bootscripts/lfs/init.d/udev_retry
+++ b/bootscripts/lfs/init.d/udev_retry
@@ -57,7 +57,10 @@ case "${1}" in
       done
 
       # 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
       ;;
 
-- 
cgit v1.2.3-54-g00ecf