From nobody Mon Mar 6 08:05:04 2023 X-Original-To: dev-commits-src-branches@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 4PVWMj0fpWz3wbF6; Mon, 6 Mar 2023 08:05:05 +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 4PVWMj0B3Xz3xy0; Mon, 6 Mar 2023 08:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678089905; 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=yd6tidVVthGpfwPo1Pd5fgbD3ZRY/sp3pqJsCukV2dU=; b=rrC+VP15N66L0Elo1TOByfldapkXCEPrSn0xUw38JnjC9zPF56LVrpmm8rR4GEcT8DLFXd rbjWd9D6q8Yk8M2qzC0GhEs+IffglzJhI0rmIzeeId8R/DMMw3EZwDhD+p7KYPM7onQyGS qRW1gEmXAv8bqkc9K0LvIJoNDxAa3bcg9NHMVLQ7g9oQPzLL84clZe6Pq7qtrwI6/G7yUi wIK12/Q4WcMsvYQV5hjTrFxC6pTnANUUO6u1vG84+NbrPiqD23sDDVcLsmmZNDxiJ46gAb ByxcHl5QCoY+w+8a4ZGZwR0rBI9qSCK2Ozj2nTZbj7B+Un+SR83xGdxUKC6haQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678089905; 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=yd6tidVVthGpfwPo1Pd5fgbD3ZRY/sp3pqJsCukV2dU=; b=kHONfDVm1X8rNA2edavdhl6uQDZoG7eMSqBXGAGzNmhiMTzYlvUO0KAMlpsTd2PXs2RlmB KYGfqp+JcuEAcOG6RdvPvEwndAMOfRnr+n9vTBUnamEHz8X44QJbQL/ObnuCi45/sXxigb uCeQ8Arxg2D6UniyaSdTRAUg9W6P3WKWYNNKxPqP0JIM/dOrmJ3Ab5WwLlYS1mwaEey2e9 yO4+wjXyDg5EpFVxLIwRApB0FovGe4v6e1G/bxOHsIziQ8MCrEe919PpRRoHuiFzWjAjIj 4P80rF96ioILf9T4rHmT6rvDoCfgn9rZHn56KgrEqMspNbmXOMW560eHrsEzDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678089905; a=rsa-sha256; cv=none; b=ocuw453+G3rv6tfBdCP4rWx0SkdNYAcwWqQ7+Y7ErsRJAmR791BTG1NBIKK2dnR5EAt1rD 8PjOFFZqdgorccROwzCP447h2Me2utHNhqPGLs0JIgm7rTiqAznEDY9vQ0G+mln8KTTMj1 BtLvaxD9bM6m23y3X2EdRIaIpYgCHWM13QPBG7TqFt6nPALeKSIo7EG6J8gwqSTnry2RLF oJOym/eZ9yd/FyajspCRDk4T1T2ks6k462azJ61qLvWa0vfr0O0aaMxSuB0yshZfiWCDEi L7gQ9AeKXKvVev1i56toULAHWWN+clRa9Yqcr78MNKWRVJNMu2/btdhOocqGqg== 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 4PVWMh6Pvrztxd; Mon, 6 Mar 2023 08:05:04 +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 326854NP086912; Mon, 6 Mar 2023 08:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3268549S086911; Mon, 6 Mar 2023 08:05:04 GMT (envelope-from git) Date: Mon, 6 Mar 2023 08:05:04 GMT Message-Id: <202303060805.3268549S086911@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: ebca19e71d8b - stable/13 - machine-id: generate a compact version of the uuid List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ebca19e71d8b58c2da1ac1bb34ed37a647903797 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ebca19e71d8b58c2da1ac1bb34ed37a647903797 commit ebca19e71d8b58c2da1ac1bb34ed37a647903797 Author: Baptiste Daroussin AuthorDate: 2023-02-28 10:31:06 +0000 Commit: Baptiste Daroussin CommitDate: 2023-03-06 08:04:44 +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 (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.'