Remove rc_force_auto as users can now specify -y in fsck_args.

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

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"

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;;