svn commit: r301613 - stable/10/etc/rc.d

[Garrett Cooper]

Author: ngie
Date: Wed Jun  8 13:34:52 2016
New Revision: 301613
URL: https://svnweb.freebsd.org/changeset/base/301613

Log:
  MFC r299843:
  
  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

Modified:
  stable/10/etc/rc.d/NETWORKING
  stable/10/etc/rc.d/routed
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/NETWORKING
==============================================================================
--- stable/10/etc/rc.d/NETWORKING	Wed Jun  8 13:32:00 2016	(r301612)
+++ stable/10/etc/rc.d/NETWORKING	Wed Jun  8 13:34:52 2016	(r301613)
@@ -5,7 +5,7 @@
 
 # PROVIDE: NETWORKING NETWORK
 # REQUIRE: netif netwait netoptions routing ppp ipfw stf faith
-# REQUIRE: defaultroute routed mrouted route6d mroute6d resolv bridge
+# REQUIRE: defaultroute mrouted route6d mroute6d resolv bridge
 # REQUIRE: static_arp static_ndp
 
 #	This is a dummy dependency, for services which require networking

Modified: stable/10/etc/rc.d/routed
==============================================================================
--- stable/10/etc/rc.d/routed	Wed Jun  8 13:32:00 2016	(r301612)
+++ stable/10/etc/rc.d/routed	Wed Jun  8 13:34:52 2016	(r301613)
@@ -5,6 +5,7 @@
 
 # PROVIDE: routed
 # REQUIRE: netif routing
+# BEFORE: NETWORK
 # KEYWORD: nojail
 
 . /etc/rc.subr