Attachment #100872 for bug #152983




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

# Try to remove any dm-crypt mappings
stop_addon dm-crypt


Line 0 Link Here

(-)conf.d/checkfs (+8 lines)
	1	# FSCK_SHUTDOWN causes checkfs to trigger during shutdown as well as startup.
	2	# The end result of this is that if any periodic non-root filesystem checks are
	3	# scheduled, under normal circumstances the actual check will happen during
	4	# shutdown rather than at next boot.
	5	# This is useful when periodic filesystem checks are causing undesirable
	6	# delays at startup, but such delays at shutdown are acceptable.
	7
	8	FSCK_SHUTDOWN="no"

Return to bug 152983

Lines 86-91 Link Here

(-)init.d/halt.sh (+14 lines)
86	do_unmount "umount" "${RC_NO_UMOUNTS}"	86	do_unmount "umount" "${RC_NO_UMOUNTS}"
87	eend $?	87	eend $?
88		88
		89	# Conditionally run filesystem checks. Note that /forcefsck skips this and
		90	# causes the forced checks to run upon boot. This is because doing forced
		91	# checks then removing /forcefsck is not practical at this point.
		92	conf=$(add_suffix /etc/conf.d/checkfs)
		93	if [[ -e ${conf} ]] ; then
		94	(
		95	. ${conf}
		96	if [[ ${FSCK_SHUTDOWN} == "yes" && ! -f /forcefsck ]]; then
		97	. /etc/init.d/checkfs
		98	start
		99	fi
		100	)
		101	fi
		102
89	# Try to remove any dm-crypt mappings	103	# Try to remove any dm-crypt mappings
90	stop_addon dm-crypt	104	stop_addon dm-crypt
91		105