Page MenuHomeFreeBSD
Differential D37722

Add new rc: machine_id to generate /etc/machine-id
ClosedPublic
Actions

Authored by tcberner on Dec 17 2022, 9:22 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Aug 20, 9:35 PM
Unknown Object (File)
Sun, Aug 17, 9:06 PM
Unknown Object (File)
Sat, Aug 16, 10:58 PM
Unknown Object (File)
Sat, Aug 16, 5:37 PM
Unknown Object (File)
Mon, Aug 11, 3:25 AM
Unknown Object (File)
Sat, Aug 2, 12:10 PM
Unknown Object (File)
Sun, Jul 27, 1:36 PM
Unknown Object (File)
Sun, Jul 27, 5:30 AM
View All Files
Subscribers
arichardson
bcr
dan.mcgregor_usask.ca
freebsd_igalic.co
imp
jlduran
tijl

Details

Reviewers
bapt
Group Reviewers
desktop
Commits
rG17333d92643d: Add new rc: machine_id to generate /etc/machine-id
rG62a149bf6219: Add new rc: machine_id to generate /etc/machine-id
Summary

This new default-enabled rc will generate a /etc/machine-id file if it
does not exist, and prefill it with a newly generated UUID of version 4
[2].

This file is amongst other things used by libraries like GLib.

Bump FreeBSD version to be able to easily add support for older version
of FreeBSD via a package.

[1] Linux machine-id(5): https://www.man7.org/linux/man-pages/man5/machine-id.5.html
[2] f176fe8e7f638e585afcd2f4dd52a522c4648f63

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 48776
Build 45662: arc lint + arc unit

Event Timeline

tcberner created this revision.Dec 17 2022, 9:22 AM
Herald added a subscriber: imp. · View Herald TranscriptDec 17 2022, 9:22 AM
tcberner requested review of this revision.Dec 17 2022, 9:22 AM
Harbormaster completed remote builds in B48740: Diff 114219.Dec 17 2022, 9:22 AM
tcberner updated this revision to Diff 114220.Dec 17 2022, 9:25 AM
  • fix names
Harbormaster completed remote builds in B48741: Diff 114220.Dec 17 2022, 9:25 AM
arichardson added a subscriber: arichardson.Dec 17 2022, 9:49 AM
arichardson added inline comments.
libexec/rc/rc.d/machine_id
25
tcberner updated this revision to Diff 114223.Dec 17 2022, 10:04 AM
tcberner mentioned this in D37723: sysutils/machine_id: New port - generate /etc/machine_id.
  • Fix message
Harbormaster completed remote builds in B48743: Diff 114223.Dec 17 2022, 10:06 AM
tcberner marked an inline comment as done.Dec 17 2022, 10:06 AM
tijl added a subscriber: tijl.Dec 17 2022, 11:12 AM
tijl added inline comments.
libexec/rc/rc.conf
698

I think osrelease above uses /var to support read-only /etc. So maybe you should use something like /var/db/machine-id here and make /etc/machine-id a symlink like /etc/os-release.

jlduran added a subscriber: jlduran.Dec 17 2022, 1:04 PM
jlduran added inline comments.
libexec/rc/rc.d/machine_id
32

Do we want this message displayed every time after the machine-id file is created?

jlduran added inline comments.Dec 17 2022, 1:16 PM
libexec/rc/rc.d/machine_id
32

Please, discard the comment.
It was supposed to be just the removal of -n (should be echoed with a trailing newline character) and the removal of the space at the beginning of the sentence.

bcr added a subscriber: bcr.Dec 18 2022, 12:14 PM
bcr added inline comments.
libexec/rc/rc.conf
698

Does the comment have a superfluous "if" in it (the first one)?
I think it would be better if the comment would state:
"Create /etc/machine-id on boot if missing (or NO)."

arichardson added inline comments.Dec 19 2022, 12:34 PM
libexec/rc/rc.conf
698

I think osrelease above uses /var to support read-only /etc. So maybe you should use something like /var/db/machine-id here and make /etc/machine-id a symlink like /etc/os-release.

If you decide to do this (which probably makes sense), you'll also need to add the symlink to etc/Makefile (see rS354922)

tcberner added inline comments.Dec 20 2022, 6:41 PM
libexec/rc/rc.conf
698

does it make sense to have an "ideally" static file in /var/db if so, sure, I'll move it there, and create a symlink

libexec/rc/rc.d/machine_id
32

the machine-id file should only be generated once, ideally.

tcberner updated this revision to Diff 114331.Dec 20 2022, 6:51 PM
  • Don't spam message log if machine-id exists
  • Generate machine-id in /var/db
  • Fix comment
  • Create symlink from /var/db/machine-id to /etc/machine-id
Harbormaster completed remote builds in B48776: Diff 114331.Dec 20 2022, 6:51 PM
tcberner marked 5 inline comments as done.Dec 20 2022, 6:52 PM
tcberner added inline comments.
libexec/rc/rc.conf
698

^ does it make sense that machine_id_file this is configurable given the etc/Makefile change?

tcberner updated this revision to Diff 114332.Dec 20 2022, 6:59 PM
  • Add machine_id to libexec/rc/rc.d/Makefile
Harbormaster completed remote builds in B48777: Diff 114332.Dec 20 2022, 6:59 PM
imp added a comment.Dec 20 2022, 10:05 PM

All generated files should wind up in /var/db, imho. I have lots of read-only root machines that would need yet another special case for this. They have writeable /var/db partitions though.

bapt accepted this revision.Dec 23 2022, 7:51 AM

LGTM,
I would personnally suppress all configurability in rc.conf, but I don't think it hurts to be able to do extra config via rc.conf.

please MFC After: 1 week

This revision is now accepted and ready to land.Dec 23 2022, 7:51 AM
Closed by commit rG62a149bf6219: Add new rc: machine_id to generate /etc/machine-id (authored by tcberner). · Explain WhyDec 23 2022, 4:37 PM
This revision was automatically updated to reflect the committed changes.
tcberner added a commit: rG62a149bf6219: Add new rc: machine_id to generate /etc/machine-id.
freebsd_igalic.co added a subscriber: freebsd_igalic.co.Jan 6 2023, 9:34 PM

this says MFC 1 week. that was two weeks ago.
This revision links to machine-id(5) on Linux, but perhaps we should have that man page ourselves

tcberner added a commit: rG17333d92643d: Add new rc: machine_id to generate /etc/machine-id.Jan 10 2023, 7:52 AM
dan.mcgregor_usask.ca added a subscriber: dan.mcgregor_usask.ca.Jan 10 2023, 7:20 PM

This is good, but it doesn't match what Linux does. Both systemd and dbus generate 32 character UUID strings, while this creates 36 character ones.

I'd suggest we strip the '-' characters from the machine-id file, and possibly think about ensuring that dbus's idea of the machine-id is the same as the one generated here, or since dbus will use /etc/machine-id if /var/lib/dbus/machine-id doesn't exist, maybe not generating the latter at all.

jlduran added a comment.Feb 18 2023, 3:24 PM
In D37722#863538, @dan.mcgregor_usask.ca wrote:

This is good, but it doesn't match what Linux does. Both systemd and dbus generate 32 character UUID strings, while this creates 36 character ones.

I'd suggest we strip the '-' characters from the machine-id file, and possibly think about ensuring that dbus's idea of the machine-id is the same as the one generated here, or since dbus will use /etc/machine-id if /var/lib/dbus/machine-id doesn't exist, maybe not generating the latter at all.

@tcberner regarding this comment, should we change it to /bin/uuidgen -r | tr -d - > $t, or something similar? or is not really necessary to strip the -s?

tcberner added a comment.Feb 18 2023, 4:08 PM
In D37722#879899, @jlduran_gmail.com wrote:
In D37722#863538, @dan.mcgregor_usask.ca wrote:

This is good, but it doesn't match what Linux does. Both systemd and dbus generate 32 character UUID strings, while this creates 36 character ones.

I'd suggest we strip the '-' characters from the machine-id file, and possibly think about ensuring that dbus's idea of the machine-id is the same as the one generated here, or since dbus will use /etc/machine-id if /var/lib/dbus/machine-id doesn't exist, maybe not generating the latter at all.

@tcberner regarding this comment, should we change it to /bin/uuidgen -r | tr -d - > $t, or something similar? or is not really necessary to strip the -s?

Moin moin

I probably misread the documentation that said that modern systemd creates valid UUIDs. But that probably did not mean also it uses the 'dashed' format.

mfg Tobias

jlduran added a comment.Feb 18 2023, 5:01 PM
In D37722#879900, @tcberner wrote:
In D37722#879899, @jlduran_gmail.com wrote:
In D37722#863538, @dan.mcgregor_usask.ca wrote:

This is good, but it doesn't match what Linux does. Both systemd and dbus generate 32 character UUID strings, while this creates 36 character ones.

I'd suggest we strip the '-' characters from the machine-id file, and possibly think about ensuring that dbus's idea of the machine-id is the same as the one generated here, or since dbus will use /etc/machine-id if /var/lib/dbus/machine-id doesn't exist, maybe not generating the latter at all.

@tcberner regarding this comment, should we change it to /bin/uuidgen -r | tr -d - > $t, or something similar? or is not really necessary to strip the -s?

Moin moin

I probably misread the documentation that said that modern systemd creates valid UUIDs. But that probably did not mean also it uses the 'dashed' format.

mfg Tobias

Ahh, I see:
https://www.man7.org/linux/man-pages/man5/machine-id.5.html#RELATION_TO_OSF_UUIDS

Revision Contents
Changeset List

PathSize
etc/
2 lines
libexec/
rc/
3 lines
rc.d/
34 lines

Diff 114331

View Options

etc/Makefile

Loading...
View Options

libexec/rc/rc.conf

Loading...
View Options

libexec/rc/rc.d/machine_id

Loading...