Index: user/ngie/detangle-rc/etc/rc.d/dumpon
===================================================================
--- user/ngie/detangle-rc/etc/rc.d/dumpon	(revision 289920)
+++ user/ngie/detangle-rc/etc/rc.d/dumpon	(revision 289921)
@@ -1,69 +1,68 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: dumpon
-# REQUIRE: zvol
 # BEFORE: disks
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
 name="dumpon"
 start_cmd="dumpon_start"
 stop_cmd="dumpon_stop"
 
 dumpon_try()
 {
 	if /sbin/dumpon "${1}" ; then
 		# Make a symlink in devfs for savecore
 		ln -fs "${1}" /dev/dumpdev
 		return 0
 	fi
 	warn "unable to specify $1 as a dump device"
 	return 1
 }
 
 dumpon_start()
 {
 	# Enable dumpdev so that savecore can see it. Enable it
 	# early so a crash early in the boot process can be caught.
 	#
 	case ${dumpdev} in
 	[Nn][Oo] | '')
 		;;
 	[Aa][Uu][Tt][Oo])
 		dev=$(/bin/kenv -q dumpdev)
 		if [ -n "${dev}" ] ; then
 			dumpon_try "${dev}"
 			return $?
 		fi
 		while read dev mp type more ; do
 			[ "${type}" = "swap" ] || continue
 			[ -c "${dev}" ] || continue
 			dumpon_try "${dev}" 2>/dev/null && return 0
 		done </etc/fstab
 		echo "No suitable dump device was found." 1>&2
 		return 1
 		;;
 	*)
 		dumpon_try "${dumpdev}"
 		;;
 	esac
 }
 
 dumpon_stop()
 {
 	case ${dumpdev} in
 	[Nn][Oo] | '')
 		;;
 	*)
 		rm -f /dev/dumpdev
 		/sbin/dumpon -v off
 		;;
 	esac
 }
 
 load_rc_config $name
 run_rc_command "$1"
Index: user/ngie/detangle-rc/etc/rc.d/zvol
===================================================================
--- user/ngie/detangle-rc/etc/rc.d/zvol	(revision 289920)
+++ user/ngie/detangle-rc/etc/rc.d/zvol	(revision 289921)
@@ -1,45 +1,46 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: zvol
 # REQUIRE: hostid
+# BEFORE: dumpon
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
 name="zvol"
 rcvar="zfs_enable"
 start_cmd="zvol_start"
 stop_cmd="zvol_stop"
 required_modules="zfs"
 
 zvol_start()
 {
 	# Enable swap on ZVOLs with property org.freebsd:swap=on.
 	zfs list -H -o org.freebsd:swap,name -t volume | \
 	while read state name; do
 		case "${state}" in
 		[oO][nN])
 			swapon /dev/zvol/${name}
 			;;
 		esac
 	done
 }
 
 zvol_stop()
 {
 	# Disable swap on ZVOLs with property org.freebsd:swap=on.
 	zfs list -H -o org.freebsd:swap,name -t volume | \
 	while read state name; do
 		case "${state}" in
 		[oO][nN])
 			swapoff /dev/zvol/${name}
 			;;
 		esac
 	done
 }
 
 load_rc_config $name
 run_rc_command "$1"