From owner-svn-src-stable@freebsd.org  Wed Jun  8 13:34:54 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A9A5B6F947;
 Wed,  8 Jun 2016 13:34:54 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 24B901DD1;
 Wed,  8 Jun 2016 13:34:54 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u58DYr5a040105;
 Wed, 8 Jun 2016 13:34:53 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u58DYr2q040103;
 Wed, 8 Jun 2016 13:34:53 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201606081334.u58DYr2q040103@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 8 Jun 2016 13:34:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r301613 - stable/10/etc/rc.d
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2016 13:34:54 -0000

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