[patch] backport to 1.12 branch

checkfs.patch (text/plain), 1.38 KB, created by Daniel Drake (RETIRED) on 2006-11-01 07:48:39 UTC

Index: baselayout-1.12.5/init.d/halt.sh
===================================================================
--- baselayout-1.12.5.orig/init.d/halt.sh
+++ baselayout-1.12.5/init.d/halt.sh
@@ -204,6 +204,20 @@ if [[ ${mount_worked} -eq 1 ]]; then
 	/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.
+conf=$(add_suffix /etc/conf.d/checkfs)
+if [[ -e ${conf} ]] ; then
+	(
+		. ${conf}
+		if [[ ${FSCK_SHUTDOWN} == "yes" && ! -f /forcefsck ]]; then
+			. /etc/init.d/checkfs
+			start
+		fi
+	)
+fi
+
 # Inform if there is a forced or skipped fsck
 if [[ -f /fastboot ]]; then
 	echo
Index: baselayout-1.12.5/etc/conf.d/checkfs
===================================================================
--- /dev/null
+++ baselayout-1.12.5/etc/conf.d/checkfs
@@ -0,0 +1,9 @@
+# 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.
+
+FSCK_SHUTDOWN="no"
+