svn commit: r301616 - stable/9/etc/rc.d

[Garrett Cooper]

Author: ngie
Date: Wed Jun  8 13:41:51 2016
New Revision: 301616
URL: https://svnweb.freebsd.org/changeset/base/301616

Log:
  MFstable/10 r301615:
  
  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/9/etc/rc.d/hostid_save
  stable/9/etc/rc.d/netif
Directory Properties:
  stable/9/   (props changed)
  stable/9/etc/   (props changed)
  stable/9/etc/rc.d/   (props changed)

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

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