Skip to contentSkip to conversation

systemd-compat-units: drop machineid.service

PATCH In review Ross Burton 2 participants 6 messages Dec 12, 2013 – Dec 18, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 systemd-compat-units: drop machineid.service

systemd will create the machine ID automatically if it isn't set, so this unit doesn't serve any purpose.

---
 meta/recipes-core/systemd/systemd-compat-units.bb      |    4 ----
 .../systemd/systemd-compat-units/machineid.service     |   16 ----------------
 2 files changed, 20 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd-compat-units/machineid.service
meta/recipes-core/systemd/systemd-compat-units.bb +0 -4
index 6eb5ffd..e4d93d2 100644
@@ -19,10 +19,6 @@ do_install() {
 	install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system
 	ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/
 	ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
-
-	install -m 0644 ${WORKDIR}/machineid.service ${D}${systemd_unitdir}/system
-	ln -sf ../machineid.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
-	ln -sf ../machineid.service ${D}${systemd_unitdir}/system/basic.target.wants/
 }
 
 SYSTEMD_DISABLED_SYSV_SERVICES = " \
meta/recipes-core/systemd/systemd-compat-units/machineid.service deleted +0 -16
deleted file mode 100644
index f586c6d..0000000
@@ -1,16 +0,0 @@
-[Unit]
-Description=Machine ID first boot configure
-DefaultDependencies=no
-ConditionPathExists=|!/etc/machine-id
-After=systemd-remount-fs.service
-Before=sysinit.target
-
-[Service]
-ExecStart=/bin/systemd-machine-id-setup
-RemainAfterExit=No
-Type=oneshot
-StandardOutput=syslog
-
-[Install]
-WantedBy=basic.target
-WantedBy=sysinit.target
Signature · 1 line
1.7.10.4
#1 lore raw

Op 12 dec. 2013, om 11:04 heeft Ross Burton <[email protected]> het volgende geschreven:

Quoted 1 line

systemd will create the machine ID automatically if it isn't set,

That's not the whole story, it will generate a new one every boot

Quoted 1 line

so this unit doesn't serve any purpose.

That's correct, you need to generate it offline, since /etc/machine-id is a bind mount after booting :(

Quoted 52 lines

---
meta/recipes-core/systemd/systemd-compat-units.bb | 4 ----
.../systemd/systemd-compat-units/machineid.service | 16 ----------------

2 files changed, 20 deletions(-)

delete mode 100644 meta/recipes-core/systemd/systemd-compat-units/machineid.service

meta/recipes-core/systemd/systemd-compat-units.bb +0 -4
index 6eb5ffd..e4d93d2 100644
@@ -19,10 +19,6 @@ do_install() {
 	install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system
 	ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/
 	ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
-
-	install -m 0644 ${WORKDIR}/machineid.service ${D}${systemd_unitdir}/system
-	ln -sf ../machineid.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
-	ln -sf ../machineid.service ${D}${systemd_unitdir}/system/basic.target.wants/
 }
 
 SYSTEMD_DISABLED_SYSV_SERVICES = " \
meta/recipes-core/systemd/systemd-compat-units/machineid.service deleted +0 -16
deleted file mode 100644
index f586c6d..0000000
@@ -1,16 +0,0 @@
-[Unit]
-Description=Machine ID first boot configure
-DefaultDependencies=no
-ConditionPathExists=|!/etc/machine-id
-After=systemd-remount-fs.service
-Before=sysinit.target
-
-[Service]
-ExecStart=/bin/systemd-machine-id-setup
-RemainAfterExit=No
-Type=oneshot
-StandardOutput=syslog
-
-[Install]
-WantedBy=basic.target
-WantedBy=sysinit.target
Signature · 6 lines
1.7.10.4

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
#2 lore raw
Quoted 5 lines · Koen Kooi

Op 12 dec. 2013, om 11:04 heeft Ross Burton <[email protected]> het volgende geschreven:

Quoted 1 line

systemd will create the machine ID automatically if it isn't set,

That's not the whole story, it will generate a new one every boot

It will generate a new one on boot *if* /etc/machine-id doesn't contain a valid ID. If /etc is read-write then this happens once on first boot.

Quoted 3 lines
Quoted 1 line

so this unit doesn't serve any purpose.

That's correct, you need to generate it offline, since /etc/machine-id is a bind mount after booting :(

Why is that bad? In the read-only-rootfs case you can either pre-seed the machine ID at image creation time (if a single machine ID across all instances is reasonable) or let systemd create a fresh one on every boot in /run/machine-id and bind-mount /etc/machine-id to it.

Ross

#3 lore raw

Op 18 dec. 2013, om 16:03 heeft Burton, Ross <[email protected]> het volgende geschreven:

Quoted 10 lines · Koen Kooi
Quoted 5 lines

Op 12 dec. 2013, om 11:04 heeft Ross Burton <[email protected]> het volgende geschreven:

Quoted 1 line

systemd will create the machine ID automatically if it isn't set,

That's not the whole story, it will generate a new one every boot

It will generate a new one on boot *if* /etc/machine-id doesn't contain a valid ID. If /etc is read-write then this happens once on first boot.

Right, booting with 'ro' in the kernel cmdline will prevent that from happening, which means...

Quoted 9 lines
Quoted 4 lines
Quoted 2 lines

so this unit doesn't serve any purpose.

That's correct, you need to generate it offline, since /etc/machine-id is a bind mount after booting :(

Why is that bad? In the read-only-rootfs case you can either pre-seed the machine ID at image creation time (if a single machine ID across all instances is reasonable) or let systemd create a fresh one on every boot in /run/machine-id and bind-mount /etc/machine-id to it.

... every boot you get a new machine ID and hence a new journal ID, which sucks. We can debate if that sucks more or less than having duplicate machine IDs across the boards on your desk :)

regards,

Koen

#4 lore raw
Quoted 8 lines · Koen Kooi
Quoted 4 lines

Why is that bad? In the read-only-rootfs case you can either pre-seed the machine ID at image creation time (if a single machine ID across all instances is reasonable) or let systemd create a fresh one on every boot in /run/machine-id and bind-mount /etc/machine-id to it.

... every boot you get a new machine ID and hence a new journal ID, which sucks. We can debate if that sucks more or less than having duplicate machine IDs across the boards on your desk :)

Out of the box, the journal is in a tmpfs, so it disappears anyway.

Either way, this service file isn't useful.

Ross

#5 lore raw
In reply to Koen Kooi
Quoted 1 line · Koen Kooi

... every boot you get a new machine ID and hence a new journal ID, which sucks. We can debate if that sucks more or less than having duplicate machine IDs across the boards on your desk :)

In the spirit of Linux we can make this a choice, though something like a systemd postinst that can optionally write a machine ID to /etc. If enabled, the rootfs will get a machine ID at construction time.

Ross