MFC r299839,r299840,r299841:

r299839:

Make FILESYSTEMS, dumpon, and var not depend on zfs and zvol

Make zfs and zvol come before all of the items that depended on them
previously

r299840:

Conditionalize etc/rc.d/{zfs,zvol} install on MK_ZFS != no

r299841:

Remove etc/rc.d/{zfs,zvol} if MK_ZFS != no

7 files changed, 11 insertions, 5 deletions

diff --git a/etc/rc.d/FILESYSTEMS b/etc/rc.d/FILESYSTEMS
index 738c28f..ccd7ea7 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/Makefile b/etc/rc.d/Makefile
index 5f2ba15..a80f631 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -134,8 +134,6 @@ FILES=	DAEMON \
 	ypset \
 	ypupdated \
 	ypxfrd \
-	zfs \
-	zvol
 
 .if ${MK_ACCT} != "no"
 FILES+=		accounting
@@ -283,6 +281,11 @@ FILES+=		hostapd
 FILES+=		wpa_supplicant
 .endif
 
+.if ${MK_ZFS} != "no"
+FILES+=		zfs
+FILES+=		zvol
+.endif
+
 FILESDIR=	/etc/rc.d
 FILESMODE=	${BINMODE}
 
diff --git a/etc/rc.d/dumpon b/etc/rc.d/dumpon
index ce5fc1c..ad61bf43 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 2be2484..18736fe 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 598723a..e76aac6 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 b52f4ce..368a9fb 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
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index b29dc15..cf70b87 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -650,6 +650,8 @@ OLD_DIRS+=usr/share/dtrace
 OLD_FILES+=boot/gptzfsboot
 OLD_FILES+=boot/zfsboot
 OLD_FILES+=boot/zfsloader
+OLD_FILES+=etc/rc.d/zfs
+OLD_FILES+=etc/rc.d/zvol
 OLD_FILES+=etc/devd/zfs.conf
 OLD_FILES+=etc/periodic/daily/404.status-zfs
 OLD_FILES+=etc/periodic/daily/800.scrub-zfs