From nobody Mon Mar 06 21:18:37 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 4PVrzK5mZbz3wPLs; Mon, 6 Mar 2023 21:18:37 +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 4PVrzK4K4qz3Byg; Mon, 6 Mar 2023 21:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137517; 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=FKm8YqFil1ISVa1FHt8rKaB56KH0JUJEV2QUsnLXoOs=; b=c69CUe4WajeqGsqmxOzuY4ZDKLKB2ADH4RzhpUJw/O1iFN6wOSJHVatXMcCl8mjkgxi289 kZHZpTc4hDMMHvH+t52SSTC9Phy1gbJ+no41HMiKYMOhaeclrmsA2gCvlqaAyukweofsBi VXF2TYhjSrDM3mLJ3rnUXjR+9wQYfD27QcrxjB6ihV0K+F/aF4eANzfXwXy0ushWhn9Wyj yKAvSKgR+5FMxJEYg2VQjnt23Dnsb7/VChaBJ/XOdguyIywXeUXCZxAYXW7pPaVbwIHwO9 DDVO6cYm68TpqLvTdjNTt4/RtoxtU2pI1vTevYKdIw5cHo1Ev9nPoYtlVJOpNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678137517; 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=FKm8YqFil1ISVa1FHt8rKaB56KH0JUJEV2QUsnLXoOs=; b=Xa2SYCsCSxxF7/CTXFa2lPz8q0Er0YpziWvchc6OVPVisI9TJHCaI7ehsiyfec+erP+y0v 4DW6cXr/ssuDg/IkzirbfgzQGTTH5313+OEFPAm/ph3Q1JUnEPO2R74myWeon756KQRWmS Un7vGvxrku5Lmgm8T3fVUqVKgUxG4eSBULukOcEltetF+cdUhCOuaCR72l5EM0uym8jIzL KasHaAIoZXa/WDWyVEYwX6BUUITEYkfVQgVcOdgK3I3IXk6pTXW64XJExoL7UbCi4lfm4k G3DevzpX9/nliEC+wKet1ztbjz0wVEo3zJyWD/PTLRoGsJxK427+bg8iSJt7IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678137517; a=rsa-sha256; cv=none; b=nnv4YqYyUY2k1oZuZE6/vI8IYDuJSR1Fo6U18NZ2PeURdw0ZU5hlMEu9ZtmqIo1xZwYPeD 9raQsEGhq8nNbf/tpGkhWARHS6L7QKsYQG8cVRvvQQMj3xaMCKFp54fPDPZs9kpyK8QuAu AfI2F9XbwzXlxP8s8rcnVslJrMRLEdfunJD4YkGmI2bWqrhUCxFR+hV3z3/Pr9CK3ufPEX STQYyUb++z40Clei5vcN/dOcT4nSFYEsNSLI9wwXozUJKIDvP/k/KJ2kQMYPpnzFUDXdJz zgNxSxFCeXOcPvVk7BNvnvHb6HNV112zIlxd/dpDGw9fbmM/jac23rUuCY8wJw== 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 4PVrzK3MMNzHQ8; Mon, 6 Mar 2023 21:18:37 +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 326LIbPv084986; Mon, 6 Mar 2023 21:18:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326LIbtp084985; Mon, 6 Mar 2023 21:18:37 GMT (envelope-from git) Date: Mon, 6 Mar 2023 21:18:37 GMT Message-Id: <202303062118.326LIbtp084985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 63270222c1ee - releng/13.2 - machine-id: generate a compact version of the uuid 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 63270222c1eefa15efa5366c4f221529e938eef8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=63270222c1eefa15efa5366c4f221529e938eef8 commit 63270222c1eefa15efa5366c4f221529e938eef8 Author: Baptiste Daroussin AuthorDate: 2023-02-28 10:31:06 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-06 21:18:00 +0000 machine-id: generate a compact version of the uuid dbus and other actually expect an uuid without hyphens Approved by: re (cperciva) Reported by: tijl MFC After: 3 days (cherry picked from commit a28ccb32bf5678fc401f1602865ee9b37ca4c990) --- libexec/rc/rc.d/machine_id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/machine_id b/libexec/rc/rc.d/machine_id index 7cfd7b2d92f8..8bf3e41d0603 100644 --- a/libexec/rc/rc.d/machine_id +++ b/libexec/rc/rc.d/machine_id @@ -23,7 +23,7 @@ machine_id_start() if [ ! -f ${machine_id_file} ] ; then startmsg -n "Creating ${machine_id_file} " t=$(mktemp -t machine-id) - /bin/uuidgen -r -o $t + /bin/uuidgen -r -c -o $t install -C -o root -g wheel -m ${machine_id_perms} "$t" "${machine_id_file}" rm -f "$t" startmsg 'done.'