diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-20 16:00:32 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-20 16:00:32 +0100 |
| commit | aedf698f3e93b2d376e03b85c471f0f54ccda50d (patch) | |
| tree | a921b59961c1bf7b0dd0ade73c19a2e427a39d80 | |
| parent | 1bd4903c8faab8af259ecb35bbad05d938e250c5 (diff) | |
| parent | 61fea35e14d84144e6e2122f5cd247f9c7e6245e (diff) | |
Merge pull request #1966 from evverx/fix-initrd-searching-on-debian
tests: fix initrd searching on Debian/Ubuntu
| -rw-r--r-- | test/README.testsuite | 2 | ||||
| -rw-r--r-- | test/test-functions | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/README.testsuite b/test/README.testsuite index 5c7aca43a8..fa7e73ce3a 100644 --- a/test/README.testsuite +++ b/test/README.testsuite @@ -36,7 +36,7 @@ you can even skip the "clean" and "setup" if you want to run the machine again. $ sudo make KERNEL_APPEND="systemd.unit=multi-user.target" run You can specify a different kernel and initramfs with $KERNEL_BIN and $INITRD. -(Fedora's default kernel path and initramfs are used by default) +(Fedora's or Debian's default kernel path and initramfs are used by default) $ sudo make KERNEL_BIN=/boot/vmlinuz-foo INITRD=/boot/initramfs-bar clean check diff --git a/test/test-functions b/test/test-functions index a6eea662fc..a794f3556e 100644 --- a/test/test-functions +++ b/test/test-functions @@ -51,8 +51,11 @@ run_qemu() { && KERNEL_BIN="/boot/$MACHINE_ID/$KERNEL_VER/linux" fi + default_fedora_initrd=/boot/initramfs-${KERNEL_VER}.img + default_debian_initrd=/boot/initrd.img-${KERNEL_VER} [ "$KERNEL_BIN" ] || KERNEL_BIN=/boot/vmlinuz-$KERNEL_VER - [ "$INITRD" ] || INITRD=/boot/initramfs-${KERNEL_VER}.img + [ "$INITRD" ] || { [ -e "$default_fedora_initrd" ] && INITRD=$default_fedora_initrd; } + [ "$INITRD" ] || { [ "$LOOKS_LIKE_DEBIAN" ] && [ -e "$default_debian_initrd" ] && INITRD=$default_debian_initrd; } [ "$QEMU_SMP" ] || QEMU_SMP=1 find_qemu_bin || return 1 |