From nobody Thu Mar 9 09:37:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PXPH121RVz3wS7w; Thu, 9 Mar 2023 09:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PXPH11W9Kz4WgR; Thu, 9 Mar 2023 09:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678354653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p08MNIbkkXl4RzKoEM4evJdnFI2xolzVcLPh/4t3uH4=; b=BXLnuDuB91QZSzO23AWqWIEzWOzie+CTa2/oDlamGqQcw97AdJPp+5RWCIfH9klySzIUQQ LZ/AJ8cm/oAj6lLO+B3KzcgzswOq4eiNPMkGA7zhmIjjCDs7aHFeO8fzb/CnUKyXRE+Dbb dvdHFtd8q8js0QDpyONGOJ3vKmUpl9bxAJpQArqNoN3ia75YjBlv6JSHVRCWyaTZXDG+Rb irVWvTXsTAn1lgFyHdtetPunskKpas/ylxD9M4T43sP32J2lhC63ic2DoUU8V2UsInuQvA cKqtcta8y0lryGGkHGzmtk6ipcRb/MLsOVhPrTl4+1ci4i/VKIgxbddJvhwccQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678354653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p08MNIbkkXl4RzKoEM4evJdnFI2xolzVcLPh/4t3uH4=; b=UUjoVPyHMBBDnh1nqSwsDn0Uj8bchgT2xEy7tNZveenoe/KjnGdI8/kBVvpl4P6ZTn+UqG aONRy7pkLIbtY+wVeyHm9pezh+wZwH9PZ/ybb6AokEEplg6g61I1xIq5EaQsr9oD4Du1U2 YKsOQDBUCv9sHKLzcrTmCJX5nwz5g6TiDF6FWObLj+nyKpMUD3jvsENesmf5DXlPDrVRlA lMcGG9OqjsTkkCPYcgqRIkXeEQjza8gKf4MpNoIFt1YDhZFqOsBGRfnaL4DvBdZUVQI6TH CH/+IL3dU2NKOmRbb68vk7cWiy6Qutickj8HzdCQSD17Mafvahugztmn6t64EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678354653; a=rsa-sha256; cv=none; b=lCEzzBTJb/hGWfguwjkPmlTU2g5gZYNi5TjVoyTIywujfda3FnvdwNCgo4r+6ZcFABwmrf O6tOLrcob2ONPKnsL0uG5Xk9EgjH68b54cPemgFLLRyjdADHGOofR2CqjF/W8CO2tED47j I0wRHFb0XXleYEocp6INZcB8rSvOEzMciaSEz+g4AlgItumYJZ69KeBkrijdKGDFrGNXmV a+OfZE4lLGvojed6pEVWZlrrf0a5jTBgYjPxJPmnTmckGOOa0dOAG/1plgZOiRFdXwfwaV 8cT5WgkChz4THsid5Fz/5ko3ilKzI/NZyyUrxSESh1m4BY0N2iDJ1KxLjm+6QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PXPH10Z4cz12pQ; Thu, 9 Mar 2023 09:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3299bXoj039621; Thu, 9 Mar 2023 09:37:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3299bXSV039620; Thu, 9 Mar 2023 09:37:33 GMT (envelope-from git) Date: Thu, 9 Mar 2023 09:37:33 GMT Message-Id: <202303090937.3299bXSV039620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tijl Coosemans Subject: git: 862aab6281a5 - main - hostid: Generate random UUID by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 862aab6281a5e6b5dad89761ac17ca2a0e83ab32 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=862aab6281a5e6b5dad89761ac17ca2a0e83ab32 commit 862aab6281a5e6b5dad89761ac17ca2a0e83ab32 Author: Tijl Coosemans AuthorDate: 2023-03-09 09:02:45 +0000 Commit: Tijl Coosemans CommitDate: 2023-03-09 09:31:39 +0000 hostid: Generate random UUID by default This way MAC addresses are no longer exposed. Discussed with: bapt MFC after: 3 days --- 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 9bb7cf2f3cc1..8a5f69dbef12 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -137,6 +137,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 494e4aba84e1..8db475694090 100755 --- a/libexec/rc/rc.d/hostid +++ b/libexec/rc/rc.d/hostid @@ -126,7 +126,7 @@ hostid_generate() # Generate a random UUID if invalid or not found if [ -z "${uuid}" ]; then # If not found, fall back to software-generated UUID. - uuid=`uuidgen` + uuid=`uuidgen ${hostid_uuidgen_flags}` fi hostid_set $uuid }