projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
444b017
)
test: fall back to /boot if bootctl -p fails (#7397)
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Mon, 20 Nov 2017 19:08:11 +0000
(20:08 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 20 Nov 2017 19:08:11 +0000
(20:08 +0100)
It doesn't really matter why.
test/test-functions
patch
|
blob
|
history
diff --git
a/test/test-functions
b/test/test-functions
index
bfbd308
..
0413e16
100644
(file)
--- 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