diff options
| author | Harald Hoyer <harald@redhat.com> | 2015-02-03 10:43:24 +0100 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2015-02-03 10:51:29 +0100 |
| commit | b6f0c419e38a960873fe68bf8f89bbb0268eed02 (patch) | |
| tree | d8619f355eb8c4fe65d1faf789f0e1a4eb39df15 /test | |
| parent | edbced8a151c1b7ded685e2ec644950d2adec5f5 (diff) | |
| download | systemd-b6f0c419e38a960873fe68bf8f89bbb0268eed02.tar.gz | |
test-functions: search for the initrd and kernel according to the BLS
Also search for the initrd and kernel according to the boot loader
specification.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-functions | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/test-functions b/test/test-functions index 50daedc201..901ff48605 100644 --- a/test/test-functions +++ b/test/test-functions @@ -42,6 +42,14 @@ 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" + fi + [ "$KERNEL_BIN" ] || KERNEL_BIN=/boot/vmlinuz-$KERNEL_VER [ "$INITRD" ] || INITRD=/boot/initramfs-${KERNEL_VER}.img [ "$QEMU_SMP" ] || QEMU_SMP=1 |