svn commit: r301615 - stable/10/etc/rc.d
Garrett Cooper
ngie at FreeBSD.org
Wed Jun 8 13:40:08 UTC 2016
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
More information about the svn-src-stable
mailing list