diff options
| author | Roy Marples <roy@marples.name> | 2008-01-31 17:18:39 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-01-31 17:18:39 +0000 |
| commit | cf567c844fa0fcef5f190ce21a805db9b9ed7ffb (patch) | |
| tree | 16652788f0a60d6d817c962e4139a8aa86319a9a | |
| parent | 492a8f87cfa405e9c880b3539e44f24204ffd7fb (diff) | |
Remove rc_force_auto as users can now specify -y in fsck_args.
| -rw-r--r-- | conf.d/fsck | 4 | ||||
| -rw-r--r-- | etc/rc.conf | 7 | ||||
| -rw-r--r-- | init.d/fsck | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/conf.d/fsck b/conf.d/fsck index 6f039451..540c6f71 100644 --- a/conf.d/fsck +++ b/conf.d/fsck @@ -1,3 +1,7 @@ +# Pass any arguments to fsck. +# By default we preen. +fsck="-p" + # fsck_shutdown causes fsck to trigger during shutdown as well as startup. # The end result of this is that if any periodic non-root filesystem checks are # scheduled, under normal circumstances the actual check will happen during diff --git a/etc/rc.conf b/etc/rc.conf index 041dd3ba..c3347996 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -41,13 +41,6 @@ rc_coldplug="YES" # This allows net.wlan and any service not matching net.* to be plugged. rc_plug_services="" -# rc_force_auto tries its best to prevent user interaction during the boot and -# shutdown process. For example, fsck will automatically be run or volumes -# remounted to create proper directory trees. This feature can be dangerous -# and is meant ONLY for headless machines where getting a physical console -# hooked up is a huge pita. -rc_force_auto="NO" - # rc_logger launches a logging daemon to log the entire rc process to # /var/log/rc.log rc_logger="NO" diff --git a/init.d/fsck b/init.d/fsck index 34dd14c5..d07cec85 100644 --- a/init.d/fsck +++ b/init.d/fsck @@ -13,7 +13,6 @@ depend() start() { - local retval=0 opts= root= if [ "${RC_UNAME}" = "Linux" ]; then opts="${opts} -A -C0 -T" if echo 2>/dev/null >/.test.$$; then @@ -23,7 +22,7 @@ start() fi ebegin "Checking local filesystems" - fsck -p ${opts} + fsck ${fsck_args-p} ${opts} case $? in 0) eend 0; return 0;; 1) ewend 1 "Filesystems repaired"; return 0;; |