diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-11-20 13:06:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-20 13:06:33 +0100 |
| commit | 4ff183d419f9ec271ae311dae0bc01b4bb204b50 (patch) | |
| tree | 079c081222afc730ea96324ee801a03761c51895 /test | |
| parent | df8ca63396f826698baabfa4d5db1bcb93b89d2c (diff) | |
| parent | 906bbac4747a5adf9a5c3ee7bb1e36d8a35628fc (diff) | |
| download | systemd-4ff183d419f9ec271ae311dae0bc01b4bb204b50.tar.gz systemd-4ff183d419f9ec271ae311dae0bc01b4bb204b50.tar.bz2 systemd-4ff183d419f9ec271ae311dae0bc01b4bb204b50.zip | |
Merge pull request #7154 from keszybz/bootspec
List bootspec entries in bootctl and use the default for kexec
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-functions | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/test-functions b/test/test-functions index 65bdd44f09..bfbd308c29 100644 --- a/test/test-functions +++ b/test/test-functions @@ -14,6 +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)" if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then echo "WARNING! Cannot determine rootlibdir from pkg-config, assuming /usr/lib/systemd" >&2 @@ -61,10 +62,10 @@ function find_qemu_bin() { run_qemu() { if [ -f /etc/machine-id ]; then read MACHINE_ID < /etc/machine-id - [ -z "$INITRD" ] && [ -e "/boot/$MACHINE_ID/$KERNEL_VER/initrd" ] \ - && INITRD="/boot/$MACHINE_ID/$KERNEL_VER/initrd" - [ -z "$KERNEL_BIN" ] && [ -e "/boot/$MACHINE_ID/$KERNEL_VER/linux" ] \ - && KERNEL_BIN="/boot/$MACHINE_ID/$KERNEL_VER/linux" + [ -z "$INITRD" ] && [ -e "$EFI_MOUNT/$MACHINE_ID/$KERNEL_VER/initrd" ] \ + && INITRD="$EFI_MOUNT/$MACHINE_ID/$KERNEL_VER/initrd" + [ -z "$KERNEL_BIN" ] && [ -e "$EFI_MOUNT/$MACHINE_ID/$KERNEL_VER/linux" ] \ + && KERNEL_BIN="$EFI_MOUNT/$MACHINE_ID/$KERNEL_VER/linux" fi if [[ ! "$KERNEL_BIN" ]]; then |