Hibbian
/
Raspi-image-spec
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Fix machine-id mechanism for Buster. 

The logic wrt /etc/machine-id changed between Buster and Bullseye.
While on Bullseye the file should not exist, on Buster the file must
exist, but be empty, in order to generate a new machine-id on first
boot.
It seems that /var/lib/dbus/machine-id is a symlink to /etc/machine-id
on Buster, while a separate file on Bullseye, so nothing needs to be
done with that file/symlink.

Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
This commit is contained in:
Diederik de Haas 2021-08-23 20:48:17 +02:00
parent 7aed761507
commit 26a7de63b0
No known key found for this signature in database
GPG Key ID: D76E5BCE787EDB6E
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -79,6 +79,7 @@ raspi_base_bullseye.yaml: raspi_master.yaml
cat raspi_master.yaml | \ cat raspi_master.yaml | \
sed "s/__RELEASE__/bullseye/" |\ sed "s/__RELEASE__/bullseye/" |\
sed "s/__FIRMWARE_PKG__/raspi-firmware/" | \ sed "s/__FIRMWARE_PKG__/raspi-firmware/" | \
sed "/touch \/etc\/machine-id/d" | \
grep -v "__OTHER_APT_ENABLE__" |\ grep -v "__OTHER_APT_ENABLE__" |\
grep -v "__FIX_FIRMWARE_PKG_NAME__" |\ grep -v "__FIX_FIRMWARE_PKG_NAME__" |\
sed "s/__SECURITY_SUITE__/bullseye-security/" > $@ sed "s/__SECURITY_SUITE__/bullseye-security/" > $@

3
raspi_master.yaml
View File

@ -161,6 +161,9 @@ steps:
# populated during installation. # populated during installation.
# #
# Note this will also trigger ConditionFirstBoot=yes for systemd. # Note this will also trigger ConditionFirstBoot=yes for systemd.
# On Buster, /etc/machine-id should be an emtpy file, not an absent file
# On Bullseye, /etc/machine-id should not exist in an image
- chroot: / - chroot: /
shell: | shell: |
rm -f /etc/machine-id /var/lib/dbus/machine-id rm -f /etc/machine-id /var/lib/dbus/machine-id
touch /etc/machine-id