diff --git a/runners/org.osbuild.centos9 b/runners/org.osbuild.centos9 new file mode 100755 index 00000000..963e2bc5 --- /dev/null +++ b/runners/org.osbuild.centos9 @@ -0,0 +1,48 @@ +#!/usr/bin/python3 + +import os +import subprocess +import sys + +import osbuild.api + + +def ldconfig(): + # ld.so.conf must exist, or `ldconfig` throws a warning + subprocess.run(["touch", "/etc/ld.so.conf"], check=True) + subprocess.run(["ldconfig"], check=True) + + +def sysusers(): + try: + subprocess.run(["systemd-sysusers"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True) + except subprocess.CalledProcessError as error: + sys.stderr.write(error.stdout) + sys.exit(1) + + +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. + subprocess.run(["systemd-tmpfiles", "--create"], check=False) + + +def nsswitch(): + # the default behavior is fine, but using nss-resolve does not + # necessarily work in a non-booted container, so make sure that + # is not configured. + try: + os.remove("/etc/nsswitch.conf") + except FileNotFoundError: + pass + + +if __name__ == "__main__": + with osbuild.api.exception_handler(): + ldconfig() + sysusers() + tmpfiles() + nsswitch() + + r = subprocess.run(sys.argv[1:], check=False) + sys.exit(r.returncode) diff --git a/runners/org.osbuild.rhel90 b/runners/org.osbuild.rhel90 deleted file mode 100755 index 963e2bc5..00000000 --- a/runners/org.osbuild.rhel90 +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/python3 - -import os -import subprocess -import sys - -import osbuild.api - - -def ldconfig(): - # ld.so.conf must exist, or `ldconfig` throws a warning - subprocess.run(["touch", "/etc/ld.so.conf"], check=True) - subprocess.run(["ldconfig"], check=True) - - -def sysusers(): - try: - subprocess.run(["systemd-sysusers"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True) - except subprocess.CalledProcessError as error: - sys.stderr.write(error.stdout) - sys.exit(1) - - -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. - subprocess.run(["systemd-tmpfiles", "--create"], check=False) - - -def nsswitch(): - # the default behavior is fine, but using nss-resolve does not - # necessarily work in a non-booted container, so make sure that - # is not configured. - try: - os.remove("/etc/nsswitch.conf") - except FileNotFoundError: - pass - - -if __name__ == "__main__": - with osbuild.api.exception_handler(): - ldconfig() - sysusers() - tmpfiles() - nsswitch() - - r = subprocess.run(sys.argv[1:], check=False) - sys.exit(r.returncode) diff --git a/runners/org.osbuild.rhel90 b/runners/org.osbuild.rhel90 new file mode 120000 index 00000000..ffc70521 --- /dev/null +++ b/runners/org.osbuild.rhel90 @@ -0,0 +1 @@ +org.osbuild.centos9 \ No newline at end of file