From owner-svn-src-stable-10@freebsd.org  Wed Jun  8 13:40:08 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 BAB61B6FB02;
 Wed,  8 Jun 2016 13:40:08 +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 8CCF71362;
 Wed,  8 Jun 2016 13:40:08 +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 u58De7PR040576;
 Wed, 8 Jun 2016 13:40:07 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u58De74b040574;
 Wed, 8 Jun 2016 13:40:07 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201606081340.u58De74b040574@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:40:07 +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: r301615 - 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-10@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2016 13:40:08 -0000

Author: ngie
Date: Wed Jun  8 13:40:07 2016
New Revision: 301615
URL: https://svnweb.freebsd.org/changeset/base/301615

Log:
  MFC r299844,r300931:
  
  r299844:
  
  Make hostid_save depend on hostid
  
  r300931:
  
  Make netif REQUIRE hostid
  
  As noted in the PR, if etc/rc.d/zvol is removed, netif will be run before
  hostid, and the MAC address generated for any bridge devices will be
  non-deterministic. Make the MAC address generated be deterministic for
  bridge devices by explicitly REQUIRE'ing hostid.
  
  This fixes up the rest of the PR, inadvertently committed in r299844
  
  PR: 195188

Modified:
  stable/10/etc/rc.d/hostid_save
  stable/10/etc/rc.d/netif
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/hostid_save
==============================================================================
--- stable/10/etc/rc.d/hostid_save	Wed Jun  8 13:37:18 2016	(r301614)
+++ stable/10/etc/rc.d/hostid_save	Wed Jun  8 13:40:07 2016	(r301615)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: hostid_save
-# REQUIRE: root
+# REQUIRE: hostid root
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: stable/10/etc/rc.d/netif
==============================================================================
--- stable/10/etc/rc.d/netif	Wed Jun  8 13:37:18 2016	(r301614)
+++ stable/10/etc/rc.d/netif	Wed Jun  8 13:40:07 2016	(r301615)
@@ -27,7 +27,7 @@
 
 # PROVIDE: netif
 # REQUIRE: atm1 FILESYSTEMS serial sppp sysctl
-# REQUIRE: ipfilter ipfs
+# REQUIRE: hostid ipfilter ipfs
 # KEYWORD: nojailvnet
 
 . /etc/rc.subr