From owner-svn-src-head@freebsd.org  Sat Apr 30 09:50:09 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 E744DAD9230;
 Sat, 30 Apr 2016 09:50:09 +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 B95961B92;
 Sat, 30 Apr 2016 09:50:09 +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 u3U9o8D6060948;
 Sat, 30 Apr 2016 09:50:08 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3U9o8pk060946;
 Sat, 30 Apr 2016 09:50:08 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201604300950.u3U9o8pk060946@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: Sat, 30 Apr 2016 09:50:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298844 - head/etc/rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Apr 2016 09:50:10 -0000

Author: ngie
Date: Sat Apr 30 09:50:08 2016
New Revision: 298844
URL: https://svnweb.freebsd.org/changeset/base/298844

Log:
  Make SERVERS REQUIRE clean when MK_KERBEROS==no
  
  Make kdc run BEFORE SERVERS instead of being REQUIREd by SERVERS,
  so systems that pedantically check REQUIREs function after r270782
  
  MFC after: 1 week
  X-MFC with: r270782
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/SERVERS
  head/etc/rc.d/kdc

Modified: head/etc/rc.d/SERVERS
==============================================================================
--- head/etc/rc.d/SERVERS	Sat Apr 30 09:43:01 2016	(r298843)
+++ head/etc/rc.d/SERVERS	Sat Apr 30 09:50:08 2016	(r298844)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: SERVERS
-# REQUIRE: mountcritremote abi ldconfig savecore watchdogd kdc
+# REQUIRE: mountcritremote abi ldconfig savecore watchdogd
 
 #	This is a dummy dependency, for early-start servers relying on
 #	some basic configuration.

Modified: head/etc/rc.d/kdc
==============================================================================
--- head/etc/rc.d/kdc	Sat Apr 30 09:43:01 2016	(r298843)
+++ head/etc/rc.d/kdc	Sat Apr 30 09:50:08 2016	(r298844)
@@ -5,6 +5,7 @@
 
 # PROVIDE: kdc
 # REQUIRE: NETWORKING
+# BEFORE: SERVERS
 # KEYWORD: shutdown
 
 . /etc/rc.subr