From 53ffd84c4d3fd87b521a878b7fbeac3a7dc20260 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Sun, 30 Nov 2014 00:21:06 +0000
Subject: [PATCH] Rework rc.d requirements so zfs and zvol come before relevant
 services so they can be decoupled from the build

---
 etc/rc.d/FILESYSTEMS | 2 +-
 etc/rc.d/dumpon      | 1 -
 etc/rc.d/var         | 2 +-
 etc/rc.d/zfs         | 1 +
 etc/rc.d/zvol        | 1 +
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/etc/rc.d/FILESYSTEMS b/etc/rc.d/FILESYSTEMS
index 738c28f22299..ccd7ea713834 100755
--- a/etc/rc.d/FILESYSTEMS
+++ b/etc/rc.d/FILESYSTEMS
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: FILESYSTEMS
-# REQUIRE: root mountcritlocal cleanvar zfs
+# REQUIRE: root mountcritlocal cleanvar
 
 #	This is a dummy dependency, for services which require file systems
 #	to be mounted before starting.  It also serves as the default early /
diff --git a/etc/rc.d/dumpon b/etc/rc.d/dumpon
index ce5fc1c92abc..ad61bf432af7 100755
--- a/etc/rc.d/dumpon
+++ b/etc/rc.d/dumpon
@@ -4,7 +4,6 @@
 #
 
 # PROVIDE: dumpon
-# REQUIRE: zvol
 # BEFORE: disks
 # KEYWORD: nojail
 
diff --git a/etc/rc.d/var b/etc/rc.d/var
index 2be24842bd0d..18736fe84a5e 100755
--- a/etc/rc.d/var
+++ b/etc/rc.d/var
@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: var
-# REQUIRE: mountcritlocal zfs
+# REQUIRE: mountcritlocal
 
 # NFS /var is not supported, unless NFS /var is part of diskless NFS /
 
diff --git a/etc/rc.d/zfs b/etc/rc.d/zfs
index 598723a6b203..e76aac61f7f0 100755
--- a/etc/rc.d/zfs
+++ b/etc/rc.d/zfs
@@ -5,6 +5,7 @@
 
 # PROVIDE: zfs
 # REQUIRE: mountcritlocal
+# BEFORE: FILESYSTEMS var
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/zvol b/etc/rc.d/zvol
index b52f4cefb330..368a9fb0b705 100755
--- a/etc/rc.d/zvol
+++ b/etc/rc.d/zvol
@@ -5,6 +5,7 @@
 
 # PROVIDE: zvol
 # REQUIRE: hostid
+# BEFORE: dumpon
 # KEYWORD: nojail
 
 . /etc/rc.subr