diff options
| author | DJ Lucas <dj@linuxfromscratch.org> | 2008-10-30 23:58:57 +0000 |
|---|---|---|
| committer | DJ Lucas <dj@linuxfromscratch.org> | 2008-10-30 23:58:57 +0000 |
| commit | ed20c2dd120e5f34d416e98dfce4b5a27faf7daf (patch) | |
| tree | 09488d9eb3cc77444ce925ed8a47a8a7827b2e94 /bootscripts | |
| parent | 9d25a897d239b9eed01d09692f4b6d28e2995d50 (diff) | |
Moved cleanfs immediately after mountfs and removed the timestamp maker for stale files.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8721 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'bootscripts')
| -rw-r--r-- | bootscripts/ChangeLog | 9 | ||||
| -rw-r--r-- | bootscripts/Makefile | 6 | ||||
| -rw-r--r-- | bootscripts/lfs/init.d/cleanfs | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index eec6d5042..790329af6 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,9 @@ +2008-10-27 DJ Lucas <dj@linuxfromscratch.org> + * lfs/init.d/cleanfs: Removed '! -newer /proc' from find commands in + check for stale files in /var/lock and /var/run. + * Makefile: Reversed cleanfs and udev_retry scripts so that cleanfs + runs immediately after mountfs. + 2008-10-26 Dan Nicholson <dnicholson@linuxfromscratch.org> * lfs/init.d/functions: Remove stale pid files when encountered in loadproc/killproc/reloadproc. When the bootscript specifies @@ -10,7 +16,7 @@ been accepted upstream. 2008-05-21 Bryan Kadzban <bryan@linuxfromscratch.org> - * lfs/init.d/udev: lfs/init.d/udev_retry: Use new udevadm program. + * lfs/init.d/udev, lfs/init.d/udev_retry: Use new udevadm program. 2007-08-20 DJ Lucas <dj@linuxfromscratch.org> * lfs/init.d/setclock: Added missing 'stop' argument to usage text @@ -108,6 +114,7 @@ n/a - June 2, 2006 * Removed console config file and makefile targets. * Removed references to /dev/bug and bugreport in udevand udev_retry bootscripts. (DJ Lucas) + n/a - April 17, 2006 * Updated udev script to use the new udevsettle program. * Added udev_retry script for systems that have /usr on a different diff --git a/bootscripts/Makefile b/bootscripts/Makefile index 4c6bcca10..c789a7225 100644 --- a/bootscripts/Makefile +++ b/bootscripts/Makefile @@ -75,8 +75,8 @@ install: create-dirs create-service-dir ln -sf ../init.d/setclock ${EXTDIR}/rc.d/rcsysinit.d/S25setclock ln -sf ../init.d/checkfs ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs - ln -sf ../init.d/udev_retry ${EXTDIR}/rc.d/rcsysinit.d/S45udev_retry - ln -sf ../init.d/cleanfs ${EXTDIR}/rc.d/rcsysinit.d/S50cleanfs + ln -sf ../init.d/cleanfs ${EXTDIR}/rc.d/rcsysinit.d/S45cleanfs + ln -sf ../init.d/udev_retry ${EXTDIR}/rc.d/rcsysinit.d/S50udev_retry ln -sf ../init.d/console ${EXTDIR}/rc.d/rcsysinit.d/S70console ln -sf ../init.d/localnet ${EXTDIR}/rc.d/rcsysinit.d/S80localnet ln -sf ../init.d/sysctl ${EXTDIR}/rc.d/rcsysinit.d/S90sysctl @@ -126,7 +126,7 @@ minimal: create-dirs create-service-dir ln -sf ../init.d/setclock ${EXTDIR}/rc.d/rcsysinit.d/S25setclock ln -sf ../init.d/checkfs ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs - ln -sf ../init.d/cleanfs ${EXTDIR}/rc.d/rcsysinit.d/S50cleanfs + ln -sf ../init.d/cleanfs ${EXTDIR}/rc.d/rcsysinit.d/S45cleanfs if [ ! -f ${EXTDIR}/sysconfig/rc ]; then install -m ${CONFMODE} lfs/sysconfig/rc ${EXTDIR}/sysconfig/; fi .PHONY: all create-dirs create-service-dir \ diff --git a/bootscripts/lfs/init.d/cleanfs b/bootscripts/lfs/init.d/cleanfs index 9a4e18601..df6fb425b 100644 --- a/bootscripts/lfs/init.d/cleanfs +++ b/bootscripts/lfs/init.d/cleanfs @@ -80,11 +80,11 @@ case "${1}" in boot_mesg -n " /var/lock" ${NORMAL} cd /var/lock && - find . -type f ! -newer /proc -exec rm -f {} \; || failed=1 + find . -type f ! -exec rm -f {} \; || failed=1 boot_mesg " /var/run" ${NORMAL} cd /var/run && - find . ! -type d ! -name utmp ! -newer /proc \ + find . ! -type d ! -name utmp \ -exec rm -f {} \; || failed=1 > /var/run/utmp if grep -q '^utmp:' /etc/group ; then |