diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2012-10-13 16:14:09 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2012-10-13 16:14:09 +0000 |
| commit | 12574f2c42069a8d63ebc3ae63b9db084536163a (patch) | |
| tree | 480847ff8087b2242b9147e16526e9e59a154c3f /bootscripts | |
| parent | 5cef3143bf3c152b39cf3a38ea0b08f00b0596a9 (diff) | |
Add boot/shutdown script customization instructions
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10016 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'bootscripts')
| -rw-r--r-- | bootscripts/ChangeLog | 6 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/checkfs | 10 | ||||
| -rw-r--r-- | bootscripts/lfs/lib/services/init-functions | 4 | ||||
| -rw-r--r-- | bootscripts/lfs/sysconfig/rc.site | 16 |
4 files changed, 29 insertions, 7 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 5ff5efcf7..bc64c304a 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,9 @@ +2012-10-13 Bruce Dubbs <bdubbs@linuxfromscratch.org> + * Remove unneeded sleep in killproc + * Add option for verbose fsck + * Flatten directory structure of tarball + * Remove /fastboot or /forcecheck if set + 2012-09-05 Bruce Dubbs <bdubbs@linuxfromscratch.org> * Add udevadm trigger --action=change line to udev script to support initramfs better diff --git a/bootscripts/lfs/init.d/checkfs b/bootscripts/lfs/init.d/checkfs index ef96aaf0f..cd7904b5b 100644 --- a/bootscripts/lfs/init.d/checkfs +++ b/bootscripts/lfs/init.d/checkfs @@ -46,6 +46,7 @@ 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 @@ -73,13 +74,20 @@ 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 - fsck ${options} -a -A -C -T >/dev/null + if is_true "$VERBOSE_FSCK"; then + fsck ${options} -a -A -C -T + else + fsck ${options} -a -A -C -T >/dev/null + fi + error_value=${?} if [ "${error_value}" = 0 ]; then diff --git a/bootscripts/lfs/lib/services/init-functions b/bootscripts/lfs/lib/services/init-functions index e898826aa..29ff26270 100644 --- a/bootscripts/lfs/lib/services/init-functions +++ b/bootscripts/lfs/lib/services/init-functions @@ -344,10 +344,6 @@ killproc() sleep 1 # Check again, and fail if still running kill -0 "${pid}" 2> /dev/null && return 1 - else - # just check one last time and if still alive, fail - sleep 1 - kill -0 "${pid}" 2> /dev/null && return 1 fi fi done diff --git a/bootscripts/lfs/sysconfig/rc.site b/bootscripts/lfs/sysconfig/rc.site index 3b58035b2..207bc90fe 100644 --- a/bootscripts/lfs/sysconfig/rc.site +++ b/bootscripts/lfs/sysconfig/rc.site @@ -50,8 +50,20 @@ # Skip reading from the console #HEADLESS=yes -# Skip cleaning /tmp -#SKIPTMPCLEAN=yes +# Speed up boot without waiting for settle in udev_retry +#OMIT_UDEV_RETRY_SETTLE=yes + +# Write out fsck progress if yes +#VERBOSE_FSCK=no + +# Speed up boot without waiting for settle in udev +#OMIT_UDEV_SETTLE=y + +# Speed up boot without waiting for settle in udev_retry +#OMIT_UDEV_RETRY_SETTLE=yes + +# Skip cleaning /tmp if yes +#SKIPTMPCLEAN=no # For setclock #UTC=1 |