[patch] patch for trunk

patch (text/plain), 1.43 KB, created by Daniel Drake (RETIRED) on 2006-10-27 07:50:00 UTC

Index: init.d/halt.sh
===================================================================
--- init.d/halt.sh	(revision 2341)
+++ init.d/halt.sh	(working copy)
@@ -87,6 +87,15 @@
 do_unmount "umount" "${RC_NO_UMOUNTS}"
 eend $?
 
+# 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
+
 # Try to remove any dm-crypt mappings
 stop_addon dm-crypt
 
Index: conf.d/rc
===================================================================
--- conf.d/rc	(revision 2341)
+++ conf.d/rc	(working copy)
@@ -66,7 +66,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"
+
 ##############################################################################
 # LINUX SPECIFIC OPTIONS