Date: Fri, 3 Mar 2023 16:40:28 +0100 From: =?UTF-8?B?VMSzbA==?= Coosemans <tijl@FreeBSD.org> To: Baptiste Daroussin <bapt@FreeBSD.org>, re@FreeBSD.org Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: a28ccb32bf56 - main - machine-id: generate a compact version of the uuid Message-ID: <20230303164028.35766f35@hal.tijl.coosemans.org> In-Reply-To: <202303011818.321IIXIT067595@gitrepo.freebsd.org> References: <202303011818.321IIXIT067595@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 1 Mar 2023 18:18:33 GMT Baptiste Daroussin <bapt@FreeBSD.org> wrote: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a28ccb32bf5678fc401f1602865ee9b37ca4c990 > > commit a28ccb32bf5678fc401f1602865ee9b37ca4c990 > Author: Baptiste Daroussin <bapt@FreeBSD.org> > AuthorDate: 2023-02-28 10:31:06 +0000 > Commit: Baptiste Daroussin <bapt@FreeBSD.org> > 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.' I really think this file should be defined to contain the same UUID as /etc/hostid such that there's one and only one UUID per machine. Having two different IDs needlessly complicates things if they end up in logs etc. It also looks like on Linux virtual machines this file contains the SMBIOS UUID just like our /etc/hostid. If /etc/machine-id is supposed to be a portable way to obtain that UUID it should be the same as /etc/hostid. Please have another look at https://reviews.freebsd.org/D38811. This file is supposed to remain constant across updates. If we get this wrong in 13.2, applications may have to deal with the complications for a very long time.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20230303164028.35766f35>