svn commit: r275283 - projects/building-blocks/etc/rc.d

[Garrett Cooper]

Author: ngie
Date: Sun Nov 30 00:21:06 2014
New Revision: 275283
URL: https://svnweb.freebsd.org/changeset/base/275283

Log:
  Rework rc.d requirements so zfs and zvol come before relevant services so they
  can be decoupled from the build

Modified:
  projects/building-blocks/etc/rc.d/FILESYSTEMS
  projects/building-blocks/etc/rc.d/dumpon
  projects/building-blocks/etc/rc.d/var
  projects/building-blocks/etc/rc.d/zfs
  projects/building-blocks/etc/rc.d/zvol

Modified: projects/building-blocks/etc/rc.d/FILESYSTEMS
==============================================================================
--- projects/building-blocks/etc/rc.d/FILESYSTEMS	Sun Nov 30 00:20:20 2014	(r275282)
+++ projects/building-blocks/etc/rc.d/FILESYSTEMS	Sun Nov 30 00:21:06 2014	(r275283)
@@ -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 /

Modified: projects/building-blocks/etc/rc.d/dumpon
==============================================================================
--- projects/building-blocks/etc/rc.d/dumpon	Sun Nov 30 00:20:20 2014	(r275282)
+++ projects/building-blocks/etc/rc.d/dumpon	Sun Nov 30 00:21:06 2014	(r275283)
@@ -4,7 +4,6 @@
 #
 
 # PROVIDE: dumpon
-# REQUIRE: zvol
 # BEFORE: disks
 # KEYWORD: nojail
 

Modified: projects/building-blocks/etc/rc.d/var
==============================================================================
--- projects/building-blocks/etc/rc.d/var	Sun Nov 30 00:20:20 2014	(r275282)
+++ projects/building-blocks/etc/rc.d/var	Sun Nov 30 00:21:06 2014	(r275283)
@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: var
-# REQUIRE: mountcritlocal zfs
+# REQUIRE: mountcritlocal
 
 # NFS /var is not supported, unless NFS /var is part of diskless NFS /
 

Modified: projects/building-blocks/etc/rc.d/zfs
==============================================================================
--- projects/building-blocks/etc/rc.d/zfs	Sun Nov 30 00:20:20 2014	(r275282)
+++ projects/building-blocks/etc/rc.d/zfs	Sun Nov 30 00:21:06 2014	(r275283)
@@ -5,6 +5,7 @@
 
 # PROVIDE: zfs
 # REQUIRE: mountcritlocal
+# BEFORE: FILESYSTEMS var
 
 . /etc/rc.subr
 

Modified: projects/building-blocks/etc/rc.d/zvol
==============================================================================
--- projects/building-blocks/etc/rc.d/zvol	Sun Nov 30 00:20:20 2014	(r275282)
+++ projects/building-blocks/etc/rc.d/zvol	Sun Nov 30 00:21:06 2014	(r275283)
@@ -5,6 +5,7 @@
 
 # PROVIDE: zvol
 # REQUIRE: hostid
+# BEFORE: dumpon
 # KEYWORD: nojail
 
 . /etc/rc.subr