From: Daan De Meyer <daan@amutable.com>
Date: Thu, 26 Mar 2026 07:41:17 +0000 (+0100)
Subject: TEST-07-PID1: Don't fail in vm without ESP or XBOOTLDR mount
X-Git-Tag: v260.2~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ecb372eacc11ad46d076710e341b771ef113c4f;p=thirdparty%2Fsystemd.git

TEST-07-PID1: Don't fail in vm without ESP or XBOOTLDR mount

(cherry picked from commit e7d1030d771d46d8004d44f33585261b0e48fc43)
---

diff --git a/test/units/TEST-07-PID1.exec-context.sh b/test/units/TEST-07-PID1.exec-context.sh
index 87709560912..14cc49f2923 100755
--- a/test/units/TEST-07-PID1.exec-context.sh
+++ b/test/units/TEST-07-PID1.exec-context.sh
@@ -33,12 +33,14 @@ proc_supports_option() {
 # in that case instead of complicating the test setup even more */
 if [[ -z "${COVERAGE_BUILD_DIR:-}" ]]; then
     if ! systemd-detect-virt -cq && command -v bootctl >/dev/null; then
-        boot_path="$(bootctl --print-boot-path)"
-        esp_path="$(bootctl --print-esp-path)"
+        boot_path="$(bootctl --print-boot-path)" || :
+        esp_path="$(bootctl --print-esp-path)" || :
 
         # If the mount points are handled by automount units, make sure we trigger
         # them before proceeding further
-        ls -l "$boot_path" "$esp_path"
+        if [[ -n "${boot_path:-}" && -n "${esp_path:-}" ]]; then
+            ls -l "$boot_path" "$esp_path"
+        fi
     fi
 
     systemd-run --wait --pipe -p ProtectSystem=yes \