The branch stable/13 has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=baf1e9713969fccdaf7481e3568ca89b7237dafd
commit baf1e9713969fccdaf7481e3568ca89b7237dafd Author: Tijl Coosemans <[email protected]> AuthorDate: 2023-03-09 09:02:45 +0000 Commit: Tijl Coosemans <[email protected]> CommitDate: 2023-03-12 08:59:58 +0000 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) --- libexec/rc/rc.conf | 1 + libexec/rc/rc.d/hostid | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 }
