[patch] patch for 1.12 branch

patch (text/plain), 1.51 KB, created by Daniel Drake (RETIRED) on 2006-10-27 07:49:43 UTC

Index: init.d/halt.sh
===================================================================
--- init.d/halt.sh	(revision 2341)
+++ init.d/halt.sh	(working copy)
@@ -204,6 +204,15 @@
 	/sbin/sulogin -t 10 /dev/console
 fi
 
+# Conditionally run filesystem checks. Note that /forcefsck skips this and
+# causes the forced checks to run upon boot. This is because doing forced
+# checks then removing /forcefsck is not practical at this point.
+if [[ ${RC_FSCK_SHUTDOWN} == "yes" && ! -f /forcefsck ]]; then
+	# We cannot start init scripts in the usual way at this point, as
+	# filesystems are mounted read-only.
+	( . /etc/init.d/checkfs; start )
+fi
+
 # Inform if there is a forced or skipped fsck
 if [[ -f /fastboot ]]; then
 	echo
Index: etc/conf.d/rc
===================================================================
--- etc/conf.d/rc	(revision 2341)
+++ etc/conf.d/rc	(working copy)
@@ -120,6 +120,15 @@
 
 RC_FORCE_AUTO="no"
 
+# RC_FSCK_SHUTDOWN causes checkfs 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
+# shutdown rather than at next boot.
+# This is useful when periodic filesystem checks are causing undesirable
+# delays at startup, but such delays at shutdown are acceptable.
+
+RC_FSCK_SHUTDOWN="no"
+
 # Use this variable to control the /dev management behavior.
 #  auto   - let the scripts figure out what's best at boot
 #  devfs  - use devfs (requires sys-fs/devfsd)