From faebc897f8660875f22043f3adaca8aa7f7eb4ad Mon Sep 17 00:00:00 2001 From: ngie Date: Wed, 8 Jun 2016 13:40:07 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.freebsd.org/base/stable/10@301615 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- etc/rc.d/hostid_save | 2 +- etc/rc.d/netif | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/rc.d/hostid_save b/etc/rc.d/hostid_save index fca0521e8..e9a2e87ef 100755 --- a/etc/rc.d/hostid_save +++ b/etc/rc.d/hostid_save @@ -4,7 +4,7 @@ # # PROVIDE: hostid_save -# REQUIRE: root +# REQUIRE: hostid root # KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/netif b/etc/rc.d/netif index d8998e5e3..48d8f1d71 100755 --- a/etc/rc.d/netif +++ b/etc/rc.d/netif @@ -27,7 +27,7 @@ # PROVIDE: netif # REQUIRE: atm1 FILESYSTEMS serial sppp sysctl -# REQUIRE: ipfilter ipfs +# REQUIRE: hostid ipfilter ipfs # KEYWORD: nojailvnet . /etc/rc.subr -- 2.42.0