From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 20 Nov 2017 19:08:11 +0000 (+0100)
Subject: test: fall back to /boot if bootctl -p fails (#7397)
X-Git-Tag: v236~165
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7624e721c852e9e4ddbd413635a0323902a02661;p=thirdparty%2Fsystemd.git

test: fall back to /boot if bootctl -p fails (#7397)

It doesn't really matter why.
---

diff --git a/test/test-functions b/test/test-functions
index bfbd308c294..0413e166f24 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -14,7 +14,7 @@ NSPAWN_TIMEOUT="${NSPAWN_TIMEOUT:-infinity}"
 TIMED_OUT=  # will be 1 after run_* if *_TIMEOUT is set and test timed out
 [[ "$LOOKS_LIKE_SUSE" ]] && FSTYPE="${FSTYPE:-btrfs}" || FSTYPE="${FSTYPE:-ext4}"
 UNIFIED_CGROUP_HIERARCHY="${UNIFIED_CGROUP_HIERARCHY:-default}"
-EFI_MOUNT="$(bootctl -p)"
+EFI_MOUNT="$(bootctl -p 2>/dev/null || echo /boot)"
 
 if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then
     echo "WARNING! Cannot determine rootlibdir from pkg-config, assuming /usr/lib/systemd" >&2