Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Mar 2023 21:18:37 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 63270222c1ee - releng/13.2 - machine-id: generate a compact version of the uuid
Message-ID:  <202303062118.326LIbtp084985@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch releng/13.2 has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=63270222c1eefa15efa5366c4f221529e938eef8

commit 63270222c1eefa15efa5366c4f221529e938eef8
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2023-02-28 10:31:06 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
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.'



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303062118.326LIbtp084985>