particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stages/ostree.preptree: fix machine-id detection

Browse source 
Do the check if there is a /etc/machine-id before moving /etc to
/usr/etc, because otherwise /etc/machine-id will obviously not
exist and thus the detection is broken.
This commit is contained in:
Christian Kellner 2021-03-02 16:38:58 +00:00 • committed by Achilleas Koutsou
parent 3d27b301a2
commit 846b3274e3
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
stages/org.osbuild.ostree.preptree
View file

@ -108,6 +108,13 @@ def main(tree, options):
initramfs = options.get("initramfs-args", [])
tmp_is_dir = options.get("tmp-is-dir", True)
# rpm-ostree will either ensure that machine-id is empty
# when machineid-compat is 'true' is or will remove it
# otherwise. Since we have to decide, detect the current
# state and make rpm-ostree follow suit
machineid_compat = os.path.exists(f"{tree}/etc/machine-id")
print(f"ostree: machineid-compat: {machineid_compat}")
# Move /etc to /usr
os.rename(f"{tree}/etc", f"{tree}/usr/etc")
@ -137,13 +144,6 @@ def main(tree, options):
if os.path.lexists(f"{root}/{name}"):
move(name, root, tree)
# rpm-ostree will either ensure that machine-id is empty
# when machineid-compat is 'true' is or will remove it
# otherwise. Since we have to decide, detect the current
# state and make rpm-ostree follow suit
machineid_compat = os.path.exists(f"{tree}/etc/machine-id")
print(f"ostree: machineid-compat: {machineid_compat}")
treefile = ostree.Treefile()
treefile["boot-location"] = "new"
treefile["machineid-compat"] = machineid_compat