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 21:45:59 +0000
commita379d5c5efb2b606f2a12b94c0bfd450173b7c38 (patch)
tree6df783cf9c24fcb270805082ad83bf1d106fe6fb
parent5a905d8219bb3cfdd0488af9da8c1299fa0e5b27 (diff)
downloadsrc-a379d5c5efb2.tar.gz
src-a379d5c5efb2.zip
hostid: Generate random UUID by default
This way MAC addresses are no longer exposed. Discussed with: bapt Approved by: re (cperciva) (cherry picked from commit 862aab6281a5e6b5dad89761ac17ca2a0e83ab32) (cherry picked from commit baf1e9713969fccdaf7481e3568ca89b7237dafd)
-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 3cf7dd42eb6c..317b53e06db4 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
}