aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2023-03-09 09:02:45 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2023-03-12 08:59:58 +0000
commitbaf1e9713969fccdaf7481e3568ca89b7237dafd (patch)
tree31a2e68916916e9462553be2e444721edd21937a
parent59c26d1a95a00418892e08341e3eae074c238680 (diff)
downloadsrc-baf1e9713969.tar.gz
src-baf1e9713969.zip
hostid: Generate random UUID by default
This way MAC addresses are no longer exposed. Discussed with: bapt MFC after: 3 days (cherry picked from commit 862aab6281a5e6b5dad89761ac17ca2a0e83ab32)
-rw-r--r--libexec/rc/rc.conf1
-rwxr-xr-xlibexec/rc/rc.d/hostid2
2 files changed, 2 insertions, 1 deletions
diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf
index 6b3aacacda61..23f9406da017 100644
--- a/libexec/rc/rc.conf
+++ b/libexec/rc/rc.conf
@@ -134,6 +134,7 @@ extra_netfs_types="NO" # List of network extra filesystem types for delayed
hostname="" # Set this!
hostid_enable="YES" # Set host UUID.
hostid_file="/etc/hostid" # File with hostuuid.
+hostid_uuidgen_flags="-r" # Flags to uuidgen.
nisdomainname="NO" # Set to NIS domain if using NIS (or NO).
dhclient_program="/sbin/dhclient" # Path to dhcp client program.
dhclient_flags="" # Extra flags to pass to dhcp client.
diff --git a/libexec/rc/rc.d/hostid b/libexec/rc/rc.d/hostid
index 01697a1d1e11..7368681e8a91 100755
--- a/libexec/rc/rc.d/hostid
+++ b/libexec/rc/rc.d/hostid
@@ -117,7 +117,7 @@ hostid_generate()
warn "hostid: unable to figure out a UUID from DMI data, generating a new one"
sleep 2
# If not found, fall back to software-generated UUID.
- uuid=`uuidgen`
+ uuid=`uuidgen ${hostid_uuidgen_flags}`
fi
hostid_set $uuid
}