svn commit: r299843 - head/etc/rc.d

[Garrett Cooper]

Author: ngie
Date: Sun May 15 05:45:54 2016
New Revision: 299843
URL: https://svnweb.freebsd.org/changeset/base/299843

Log:
  Fix broken dependency with routed when MK_ROUTED != no
  
  Remove routed as a requirement in NETWORKING, and put it in routed as a BEFORE
  requirement instead
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/NETWORKING
  head/etc/rc.d/routed

Modified: head/etc/rc.d/NETWORKING
==============================================================================
--- head/etc/rc.d/NETWORKING	Sun May 15 05:38:47 2016	(r299842)
+++ head/etc/rc.d/NETWORKING	Sun May 15 05:45:54 2016	(r299843)
@@ -5,7 +5,7 @@
 
 # PROVIDE: NETWORKING NETWORK
 # REQUIRE: netif netwait netoptions routing ppp ipfw stf
-# REQUIRE: defaultroute routed route6d resolv bridge
+# REQUIRE: defaultroute route6d resolv bridge
 # REQUIRE: static_arp static_ndp
 
 #	This is a dummy dependency, for services which require networking

Modified: head/etc/rc.d/routed
==============================================================================
--- head/etc/rc.d/routed	Sun May 15 05:38:47 2016	(r299842)
+++ head/etc/rc.d/routed	Sun May 15 05:45:54 2016	(r299843)
@@ -5,6 +5,7 @@
 
 # PROVIDE: routed
 # REQUIRE: netif routing
+# BEFORE: NETWORK
 # KEYWORD: nojail
 
 . /etc/rc.subr