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

@@ -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=${?}

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.

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
       ;;
 

udev-lfs/Makefile.lfs

@@ -204,7 +204,7 @@ build/udevd: build/$(COMMON_LIB) build/udevd.o
       build/udev-local.a build/$(COMMON_LIB)
 	$(VB)strip --strip-unneeded $@
 
-build/udevadm: $(UDEV_ADMIN_OBJS)
+build/udevadm: $(UDEV_ADMIN_OBJS) build/$(COMMON_LIB)
 	@echo LINK $@
 	$(VB)gcc $(UDEV_ADMIN_OBJS) -o $@ $(LDFLAGS2) build/$(COMMON_LIB)
 	$(VB)strip --strip-unneeded $@