From 322c831d0c13d3aec4d81fe782f51c2c90f2cedb Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Sun, 15 May 2016 05:45:54 +0000 Subject: [PATCH] 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 --- etc/rc.d/NETWORKING | 2 +- etc/rc.d/routed | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/rc.d/NETWORKING b/etc/rc.d/NETWORKING index 5d0d0e50bcff..9cdb5577ed2b 100755 --- a/etc/rc.d/NETWORKING +++ b/etc/rc.d/NETWORKING @@ -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 diff --git a/etc/rc.d/routed b/etc/rc.d/routed index d0e6007a8bbe..fe150bf0b442 100755 --- a/etc/rc.d/routed +++ b/etc/rc.d/routed @@ -5,6 +5,7 @@ # PROVIDE: routed # REQUIRE: netif routing +# BEFORE: NETWORK # KEYWORD: nojail . /etc/rc.subr