Create fake machine id within the runner

Create a fake machine id before running the runner
command to avoid the annoying "Faled to resolve
specifiers in '/var/log/journal/%m': No such file or
directory" errors

osbuild/util/runners.py

@@ -33,6 +33,31 @@ def sysusers():
         sys.exit(1)
 
 
+def create_machine_id_if_needed(tree=""):
+    """Create a machine-id with a fake machine id if it does not exist"""
+    path = f"{tree}/etc/machine-id"
+    if os.path.exists(path):
+        return False
+
+    os.makedirs(f"{tree}/etc", exist_ok=True)
+    with open(path, "w", encoding="utf8") as f:
+        # create a fake machine ID to improve reproducibility
+        f.write("ffffffffffffffffffffffffffffffff\n")
+        os.fchmod(f.fileno(), 0o400)
+
+    return True
+
+
+def remove_machine_id(tree=""):
+    """Create a machine-id with a fake machine id if it does not exist"""
+    path = f"{tree}/etc/machine-id"
+    if not os.path.exists(path):
+        return
+    machine_id_file = pathlib.Path(path)
+    machine_id_file.unlink()
+    machine_id_file.touch(mode=0o444)
+
+
 def tmpfiles():
     # Allow systemd-tmpfiles to return non-0. Some packages want to create
     # directories owned by users that are not set up with systemd-sysusers.

runners/org.osbuild.centos9

@@ -9,10 +9,13 @@ from osbuild.util import runners
 if __name__ == "__main__":
     with api.exception_handler():
         runners.ldconfig()
+        created_machine_id = runners.create_machine_id_if_needed()
         runners.sysusers()
         runners.tmpfiles()
         runners.nsswitch()
 
         r = subprocess.run(sys.argv[1:], check=False)
+        if created_machine_id:
+            runners.remove_machine_id()
 
         sys.exit(r.returncode)

runners/org.osbuild.fedora30

@@ -9,10 +9,13 @@ from osbuild.util import runners
 if __name__ == "__main__":
     with api.exception_handler():
         runners.ldconfig()
+        created_machine_id = runners.create_machine_id_if_needed()
         runners.sysusers()
         runners.tmpfiles()
         runners.nsswitch()
 
         r = subprocess.run(sys.argv[1:], check=False)
+        if created_machine_id:
+            runners.remove_machine_id()
 
         sys.exit(r.returncode)

runners/org.osbuild.fedora38

@@ -9,10 +9,13 @@ from osbuild.util import runners
 if __name__ == "__main__":
     with api.exception_handler():
         runners.ldconfig()
+        created_machine_id = runners.create_machine_id_if_needed()
         runners.sysusers()
         runners.tmpfiles()
         runners.nsswitch()
         runners.sequoia()
 
         r = subprocess.run(sys.argv[1:], check=False)
+        if created_machine_id:
+            runners.remove_machine_id()
         sys.exit(r.returncode)

runners/org.osbuild.rhel81

@@ -34,11 +34,14 @@ def os_release():
 if __name__ == "__main__":
     with api.exception_handler():
         runners.ldconfig()
+        created_machine_id = runners.create_machine_id_if_needed()
         runners.sysusers()
         runners.tmpfiles()
         runners.nsswitch()
         os_release()
         runners.python_alternatives()
 
         r = subprocess.run(sys.argv[1:], check=False)
+        if created_machine_id:
+            runners.remove_machine_id()
         sys.exit(r.returncode)

runners/org.osbuild.rhel82

@@ -9,6 +9,7 @@ from osbuild.util import runners
 if __name__ == "__main__":
     with api.exception_handler():
         runners.ldconfig()
+        created_machine_id = runners.create_machine_id_if_needed()
         runners.sysusers()
         runners.tmpfiles()
         runners.nsswitch()
@@ -18,5 +19,7 @@ if __name__ == "__main__":
 
         r = subprocess.run(sys.argv[1:], env=env, check=False)
 
+        if created_machine_id:
+            runners.remove_machine_id()
 
         sys.exit(r.returncode)

stages/org.osbuild.rpm

@@ -35,14 +35,14 @@ This stage will return the following metadata via the osbuild API:
 import contextlib
 import json
 import os
-import pathlib
 import subprocess
 import sys
 import tempfile
 from operator import itemgetter
 
 from osbuild import api
 from osbuild.util.mnt import mount
+from osbuild.util.runners import create_machine_id_if_needed, remove_machine_id
 
 SCHEMA = """
 "additionalProperties": false,
@@ -263,21 +263,6 @@ def parse_input(inputs):
     return path, files
 
 
-def create_machine_id_if_needed(tree):
-    """Create a machine-id with a fake machine id if it does not exist"""
-    path = f"{tree}/etc/machine-id"
-    if os.path.exists(path):
-        return False
-
-    os.makedirs(f"{tree}/etc", exist_ok=True)
-    with open(path, "w", encoding="utf8") as f:
-        # create a fake machine ID to improve reproducibility
-        f.write("ffffffffffffffffffffffffffffffff\n")
-        os.fchmod(f.fileno(), 0o400)
-
-    return True
-
-
 # pylint: disable=too-many-branches
 def main(tree, inputs, options):
     pkgpath, packages = parse_input(inputs)
@@ -380,9 +365,7 @@ def main(tree, inputs, options):
     # remove temporary machine ID if it was created by us
     if machine_id_created:
         print("deleting the fake machine id")
-        machine_id_file = pathlib.Path(f"{tree}/etc/machine-id")
-        machine_id_file.unlink()
-        machine_id_file.touch(mode=0o444)
+        remove_machine_id(tree)
 
     if ostree_booted:
         os.unlink(ostree_booted)