gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-27 15:49:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include some omitted boot script changes

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10017 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2012-10-14 00:10:34 +00:00
parent 12574f2c42
commit 85ce884e4c
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bootscripts/lfs/init.d/checkfs
View File

@ -46,7 +46,6 @@ case "${1}" in
msg="/fastboot found, will omit " msg="/fastboot found, will omit "
msg="${msg} file system checks as requested.\n" msg="${msg} file system checks as requested.\n"
log_info_msg "${msg}" log_info_msg "${msg}"
rm /fastboot
exit 0 exit 0
fi fi
@ -74,13 +73,11 @@ case "${1}" in
msg="${msg} system checks as requested." msg="${msg} system checks as requested."
log_success_msg "$msg" log_success_msg "$msg"
options="-f" options="-f"
rm /forcefsck
else else
options="" options=""
fi fi
log_info_msg "Checking file systems..." log_info_msg "Checking file systems..."
# Note: -a option used to be -p; but this fails e.g. on fsck.minix # Note: -a option used to be -p; but this fails e.g. on fsck.minix
if is_true "$VERBOSE_FSCK"; then if is_true "$VERBOSE_FSCK"; then
fsck ${options} -a -A -C -T fsck ${options} -a -A -C -T

2
bootscripts/lfs/init.d/udev
View File

@ -58,7 +58,9 @@ case "${1}" in
/sbin/udevadm trigger --action=change --type=devices /sbin/udevadm trigger --action=change --type=devices
# Now wait for udevd to process the uevents we triggered # Now wait for udevd to process the uevents we triggered
if ! is_true "$OMIT_UDEV_SETTLE"; then
/sbin/udevadm settle /sbin/udevadm settle
fi
# If any LVM based partitions are on the system, ensure they # If any LVM based partitions are on the system, ensure they
# are activated so they can be used. # are activated so they can be used.

3
bootscripts/lfs/init.d/udev_retry
View File

@ -57,7 +57,10 @@ case "${1}" in
done done
# Now wait for udevd to process the uevents we triggered # Now wait for udevd to process the uevents we triggered
if ! is_true "$OMIT_UDEV_RETRY_SETTLE"; then
/sbin/udevadm settle /sbin/udevadm settle
fi
evaluate_retval evaluate_retval
;; ;;

2
udev-lfs/Makefile.lfs
View File

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