diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-05-19 12:05:21 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-05-19 12:05:21 +0200 |
| commit | 95cff2a7942badfe7d3fbf12a644749c3dc76b1d (patch) | |
| tree | a1c4213891e46e4fb9155bb3753c4606afb3eb32 /test/test-functions | |
| parent | aa467bcae16f7090813d6e549487e73a95157f69 (diff) | |
| download | systemd-95cff2a7942badfe7d3fbf12a644749c3dc76b1d.tar.gz | |
test: search $BOOT for kernel+initrd
$BOOT is the preferred location for kernel images. If $BOOT does not
exist, -x will print the path to ESP, so well fall back to previous
behaviour.
Diffstat (limited to 'test/test-functions')
| -rw-r--r-- | test/test-functions | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions index 30b559097b..0394076f0a 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 2>/dev/null || echo /boot)" +EFI_MOUNT="$(bootctl -x 2>/dev/null || echo /boot)" QEMU_MEM="${QEMU_MEM:-512M}" if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then |