aboutsummaryrefslogtreecommitdiff
path: root/init.d/checkfs
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-12-14 14:12:38 +0000
committerRoy Marples <roy@marples.name>2007-12-14 14:12:38 +0000
commit9f2403dffae514dca431828014a2dc9c9de4e61f (patch)
treebc1bd6ae83589f729a3bf7ca6d5ab592cbec56fd /init.d/checkfs
parenta3db3bac6242ff29871161620d0449125b3262aa (diff)
Remove Gentoo copyright from all files that I know I have written
Diffstat (limited to 'init.d/checkfs')
-rwxr-xr-xinit.d/checkfs15
1 files changed, 5 insertions, 10 deletions
diff --git a/init.d/checkfs b/init.d/checkfs
index c29c519a..8e8c6ffc 100755
--- a/init.d/checkfs
+++ b/init.d/checkfs
@@ -1,5 +1,4 @@
#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
# Copyright 2007 Roy Marples
# All rights reserved
@@ -37,17 +36,15 @@ do_checkfs() {
local retval=0 mode="-p" opts= parts=
ebegin "Checking all filesystems"
-
- if [ -e /forcefsck ] || get_bootparam "forcefsck"; then
- ewarn "A full fsck has been forced"
- mode="-f -n"
- fi
if [ "${RC_UNAME}" = "Linux" ]; then
opts="-A -C0 -R -T"
else
parts="$(fstabinfo --passno ">1")"
- [ -z "${parts}" ] && return 0
+ if [ -z "${parts}" ]; then
+ eend 0
+ return 0
+ fi
fi
fsck ${opts} ${mode} ${parts}
@@ -77,8 +74,6 @@ do_checkfs() {
fi
fi
- [ ${retval} = 0 -a -e /forcefsck ] && rm /forcefsck
-
return ${retval}
}
@@ -89,7 +84,7 @@ start() {
stop() {
# fsck on shutdown if we need to
if yesno "${fsck_shutdown:-${FSCK_SHUTDOWN}}"; then
- [ ! -f /forcefsck ] && do_checkfs
+ do_checkfs
fi
return 0
}