From nobody Wed Mar 01 18:18: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 4PRjCs5hvxz3v9JS; Wed, 1 Mar 2023 18:18: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 4PRjCs4mGzz44X4; Wed, 1 Mar 2023 18:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677694713; 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=mJsXyMyGqs/PR4lqojMbktGri2RuIBdtwIl/UWlesDo=; b=NISpCud+lGsuetzFBhgwmKcudKaE6ePuflZ846B1Z8GRBrAstemETEzRR7Om6GQ9x9npvt L36YxpXp/w1jhAXhkPmWZmavYQIwfdbjevNK7ZFjag0u4EUbX6uK6CMcWrYZEJDOTZYqxJ 22nprUWlhO1s1R91Hqp4l8KRRBw2iruZYj1ZdBxQ1PQLxZqkZeWUNZ8q59P3fMvvipqmUn LiauoxjZFPLHDqBwXklCnVy11w0pXuIRZr3iVwfhK+gUkVLKuIeSBGecDPNVD2KJKQTZal EmZPUHRyROZeoiCqMdug/TOEB3i/aCI6kVmDfx+hxqFoQuP5vLlSOT56uTJ3qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677694713; 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=mJsXyMyGqs/PR4lqojMbktGri2RuIBdtwIl/UWlesDo=; b=I9qVlX8gsAuQ7l9jz7GzQKPqIasCAdVp2oVYtubgD0vh5wS38bevk+8C2G257sYd1/toUE UyGX/ZX00WPYnJkhbE2qLnTZV9Xl5Dpd18DcHYiejTGtb4Oc1mDcBDNaZvJp9Z+Iax28ja /0UP6dmrbkuDJQBnQeeYOt0gp8t0j3ebcFjAQoZZ4qVvj3XY/laRmLr00t+UeUynaKCNMq RZ+LarW7/R4QWUucfawdoh3E4ry3rZhFDUAJzvwL4gopa3z8XMEE8RTNbGxuFJdKRQ+AK4 B80QsRjKvCeYvPk3iV5/7fmMWRQEacxVQSoqFq85ljxr2vRB0xaOTl3PLeXDVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677694713; a=rsa-sha256; cv=none; b=nn/3IXiuy1ZYFvUFhPbQcQh44hSbYhwy4ZbHRcDnaY0i2IGG7OrxB9hjdFoPICsaVKLTZ8 dFYKwJbMh1p3r4OJYs3V72M5wk6TTEjTKY+cLGv92c9FL8nhid1YZxcciJyPw/Wtk2Br+2 8tGH3T8e9KT376L4lrnX7P8q3i+9FuJra432bHxP41qAgpBlN1r/TNHE469bsC5MyoFk6b 9s0ElUw3mKTPQGyvBVM3pIvPmeO2z9KZkAw09mvtKf4vuegX3fLhVeeSlk2V4qpOfAxCYW sV2KvybEaoFWHOqaAkiwg3U9ZBRLTU/SGmaEUCZ5y2bgrHnXGFpqQzKojk3eSA== 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 4PRjCs3Tg1zkQ6; Wed, 1 Mar 2023 18:18: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 321IIXLg067596; Wed, 1 Mar 2023 18:18:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IIXIT067595; Wed, 1 Mar 2023 18:18:33 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:18:33 GMT Message-Id: <202303011818.321IIXIT067595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a28ccb32bf56 - main - 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/main X-Git-Reftype: branch X-Git-Commit: a28ccb32bf5678fc401f1602865ee9b37ca4c990 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a28ccb32bf5678fc401f1602865ee9b37ca4c990 commit a28ccb32bf5678fc401f1602865ee9b37ca4c990 Author: Baptiste Daroussin AuthorDate: 2023-02-28 10:31:06 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-01 18:16:25 +0000 machine-id: generate a compact version of the uuid dbus and other actually expect an uuid without hyphens Reported by: tijl MFC After: 3 days --- 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.'