From cb4bd7051b3900172799e7f928a951c32f1c9df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Wed, 22 Jan 2025 11:49:59 +0100 Subject: [PATCH] osbuild-image-info: don't fail on no systemd default target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some image types don't have systemd installed and don't have any default target set, e.g. 'tar' image type. Running osbuild-image-info on such image would result in traceback (e.g. [1]). Handle this case gracefully. [1] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild/-/jobs/8911649248#L6480 Signed-off-by: Tomáš Hozza --- tools/osbuild-image-info | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/osbuild-image-info b/tools/osbuild-image-info index 8d39bc58..e4b9910c 100755 --- a/tools/osbuild-image-info +++ b/tools/osbuild-image-info @@ -602,7 +602,10 @@ def read_default_target(tree): An example return value: "multi-user.target" """ - return subprocess_check_output(["systemctl", f"--root={tree}", "get-default"]).rstrip() + try: + return subprocess_check_output(["systemctl", f"--root={tree}", "get-default"]).rstrip() + except subprocess.CalledProcessError: + return "" def read_firewall_default_zone(tree):