diff options
author | David Haley | 2010-08-31 19:42:26 -0500 |
---|---|---|
committer | David Haley | 2010-08-31 19:42:26 -0500 |
commit | 975e9a485b3c7c634a1829c833e61d61fe4be4ce (patch) | |
tree | b0e09944b3cf8fa4443d4d8f4a4f3ae2cb242193 | |
parent | 1f3223dbb8b8e9b4f8dba5271d03833ffeb622f5 (diff) |
init.d/mountall.sh: checkfs() fixed to properly remove /fastboot.
There was an issue in quick /fastboot would not be removed during teh
checkfs() call. The function would return before teh appropriate 'rm'
command was called. In short, if someone placed /fastboot the filesystems
no longer be checked, ever, unless the /fastboot was manually removed
at some point down the road.
This has been corrected. IF logic has been updated to ensure that
/fastboot is removed before the function returns.
This has been tested locally and seems to be working as expeted.
-rw-r--r-- | smgl/init.d/HISTORY | 3 | ||||
-rwxr-xr-x | smgl/init.d/init.d/mountall.sh | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY index be0471bb4f..d20c78d77a 100644 --- a/smgl/init.d/HISTORY +++ b/smgl/init.d/HISTORY @@ -1,3 +1,6 @@ +2010-08-31 David C. Haley <khoralin@gmail.com> + * init.d/mountall.sh: checkfs() fixed removal of /fastboot + 2009-09-08 Arjan Bouter <abouter@sourcemage.org> * PROVIDES: added, provide INITSCRIPTS diff --git a/smgl/init.d/init.d/mountall.sh b/smgl/init.d/init.d/mountall.sh index 4107f29596..f0ddf5e89d 100755 --- a/smgl/init.d/init.d/mountall.sh +++ b/smgl/init.d/init.d/mountall.sh @@ -26,7 +26,10 @@ function recursive_rm() { checkfs() { - [ -e /fastboot ] && return + if [ -e /fastboot ]; then + rm -f /fastboot; + return; + fi [ -e /forcefsck ] && FORCE="-f" [ "$NOSOFTFIX" != yes ] && FIX="-a" [ "$FSCKFIX" = yes ] && FIX="-y" @@ -47,8 +50,6 @@ checkfs() /sbin/sulogin /sbin/reboot -f fi - - rm -f /fastboot /forcefsck } scanlvm() |