Index: head/etc/rc.d/FILESYSTEMS
===================================================================
--- head/etc/rc.d/FILESYSTEMS	(revision 299838)
+++ head/etc/rc.d/FILESYSTEMS	(revision 299839)
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: FILESYSTEMS
-# REQUIRE: root mountcritlocal cleanvar zfs
+# REQUIRE: root mountcritlocal cleanvar
 
 #	This is a dummy dependency, for services which require filesystems
 #	to be mounted before starting.  It also serves as the default early /
 #	late divider; after this point, rc.d directories are rescanned to
 #	catch scripts from other filesystems than /.
Index: head/etc/rc.d/dumpon
===================================================================
--- head/etc/rc.d/dumpon	(revision 299838)
+++ head/etc/rc.d/dumpon	(revision 299839)
@@ -1,70 +1,69 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: dumpon
-# REQUIRE: zvol
 # BEFORE: disks
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
 name="dumpon"
 desc="Dump kernel corefiles from swap to disk"
 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: head/etc/rc.d/var
===================================================================
--- head/etc/rc.d/var	(revision 299838)
+++ head/etc/rc.d/var	(revision 299839)
@@ -1,112 +1,112 @@
 #!/bin/sh
 #
 # Copyright (c) 1999  Matt Dillon
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 # PROVIDE: var
-# REQUIRE: mountcritlocal zfs
+# REQUIRE: mountcritlocal
 
 # NFS /var is not supported, unless NFS /var is part of diskless NFS /
 
 . /etc/rc.subr
 
 name="var"
 desc="Populate /var directory"
 stop_cmd=':'
 
 load_rc_config $name
 
 populate_var()
 {
 	/usr/sbin/mtree -deiU -f /etc/mtree/BSD.var.dist -p /var > /dev/null
 	case ${sendmail_enable} in
 	[Nn][Oo][Nn][Ee])
 		;;
 	*)
 		/usr/sbin/mtree -deiU -f /etc/mtree/BSD.sendmail.dist -p / > /dev/null
 		;;
 	esac
 }
 
 # If we do not have a writable /var, create a memory filesystem for /var
 # unless told otherwise by rc.conf.  We don't have /usr yet so use mkdir
 # instead of touch to test.  We want mount to record its mounts so we
 # have to make sure /var/db exists before doing the mount -a.
 #
 case "${varmfs}" in
 [Yy][Ee][Ss])
 	mount_md ${varsize} /var "${varmfs_flags}"
 	;;
 [Nn][Oo])
 	;;
 *)
 	if /bin/mkdir -p /var/.diskless 2> /dev/null; then
 		rmdir /var/.diskless
 	else
 		mount_md ${varsize} /var "${varmfs_flags}"
 	fi
 esac
 
 
 # If we have an empty looking /var, populate it, but only if we have
 # /usr available.  Hopefully, we'll eventually find a workaround, but
 # in realistic diskless setups, we're probably ok.
 case "${populate_var}" in
 [Yy][Ee][Ss])
 	populate_var
 	;;
 [Nn][Oo])
 	exit 0
 	;;
 *)
 	if [ -d /var/run -a -d /var/db -a -d /var/empty ] ; then
 		true
 	elif [ -x /usr/sbin/mtree ] ; then
 		populate_var
 	else
 		# We need mtree to populate /var so try mounting /usr.
 		# If this does not work, we can not boot so it is OK to
 		# try to mount out of order.
 		mount /usr
 		if [ ! -x /usr/sbin/mtree ] ; then
 			exit 1
 		else
 			populate_var
 		fi
 	fi
 	;;
 esac
 
 # Make sure we have /var/log/utx.lastlogin and /var/log/utx.log files
 if [ ! -f /var/log/utx.lastlogin ]; then
 	cp /dev/null /var/log/utx.lastlogin
 	chmod 644 /var/log/utx.lastlogin
 fi
 if [ ! -f /var/log/utx.log ]; then
 	cp /dev/null /var/log/utx.log
 	chmod 644 /var/log/utx.log
 fi
Index: head/etc/rc.d/zfs
===================================================================
--- head/etc/rc.d/zfs	(revision 299838)
+++ head/etc/rc.d/zfs	(revision 299839)
@@ -1,66 +1,67 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: zfs
 # REQUIRE: mountcritlocal
+# BEFORE: FILESYSTEMS var
 
 . /etc/rc.subr
 
 name="zfs"
 desc="Mount and share ZFS datasets"
 rcvar="zfs_enable"
 start_cmd="zfs_start"
 stop_cmd="zfs_stop"
 required_modules="zfs"
 
 zfs_start_jail()
 {
 	if [ `$SYSCTL_N security.jail.mount_allowed` -eq 1 ]; then
 		zfs mount -a
 	fi
 }
 
 zfs_start_main()
 {
 	zfs mount -va
 	zfs share -a
 	if [ ! -r /etc/zfs/exports ]; then
 		touch /etc/zfs/exports
 	fi
 }
 
 zfs_start()
 {
 	if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then
 		zfs_start_jail
 	else
 		zfs_start_main
 	fi
 }
 
 zfs_stop_jail()
 {
 	if [ `$SYSCTL_N security.jail.mount_allowed` -eq 1 ]; then
 		zfs unmount -a
 	fi
 }
 
 zfs_stop_main()
 {
 	zfs unshare -a
 	zfs unmount -a
 }
 
 zfs_stop()
 {
 	if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then
 		zfs_stop_jail
 	else
 		zfs_stop_main
 	fi
 }
 
 load_rc_config $name
 run_rc_command "$1"
Index: head/etc/rc.d/zvol
===================================================================
--- head/etc/rc.d/zvol	(revision 299838)
+++ head/etc/rc.d/zvol	(revision 299839)
@@ -1,46 +1,47 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: zvol
 # REQUIRE: hostid
+# BEFORE: dumpon
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
 name="zvol"
 desc="Activate swap on ZVOLs"
 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"