mirror of
https://github.com/systemd/systemd
synced 2024-10-14 20:17:52 +00:00
tests: fix kernel/initrd searching (Arch)
We can run sudo make run instead of the sudo make run KERNEL_BIN=/boot/vmlinuz-linux INITRD=/boot/initramfs-linux.img See https://github.com/systemd/systemd/issues/4607
This commit is contained in:
parent
843d5baf6a
commit
e1a2731868
|
@ -5,6 +5,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
|
||||||
export PATH
|
export PATH
|
||||||
|
|
||||||
LOOKS_LIKE_DEBIAN=$(source /etc/os-release && [[ "$ID" = "debian" || "$ID_LIKE" = "debian" ]] && echo yes)
|
LOOKS_LIKE_DEBIAN=$(source /etc/os-release && [[ "$ID" = "debian" || "$ID_LIKE" = "debian" ]] && echo yes)
|
||||||
|
LOOKS_LIKE_ARCH=$(source /etc/os-release && [[ "$ID" = "arch" ]] && echo yes)
|
||||||
KERNEL_VER=${KERNEL_VER-$(uname -r)}
|
KERNEL_VER=${KERNEL_VER-$(uname -r)}
|
||||||
KERNEL_MODS="/lib/modules/$KERNEL_VER/"
|
KERNEL_MODS="/lib/modules/$KERNEL_VER/"
|
||||||
QEMU_TIMEOUT="${QEMU_TIMEOUT:-infinity}"
|
QEMU_TIMEOUT="${QEMU_TIMEOUT:-infinity}"
|
||||||
|
@ -58,11 +59,27 @@ run_qemu() {
|
||||||
&& KERNEL_BIN="/boot/$MACHINE_ID/$KERNEL_VER/linux"
|
&& KERNEL_BIN="/boot/$MACHINE_ID/$KERNEL_VER/linux"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ ! "$KERNEL_BIN" ]]; then
|
||||||
|
if [[ "$LOOKS_LIKE_ARCH" ]]; then
|
||||||
|
KERNEL_BIN=/boot/vmlinuz-linux
|
||||||
|
else
|
||||||
|
KERNEL_BIN=/boot/vmlinuz-$KERNEL_VER
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
default_fedora_initrd=/boot/initramfs-${KERNEL_VER}.img
|
default_fedora_initrd=/boot/initramfs-${KERNEL_VER}.img
|
||||||
default_debian_initrd=/boot/initrd.img-${KERNEL_VER}
|
default_debian_initrd=/boot/initrd.img-${KERNEL_VER}
|
||||||
[ "$KERNEL_BIN" ] || KERNEL_BIN=/boot/vmlinuz-$KERNEL_VER
|
default_arch_initrd=/boot/initramfs-linux.img
|
||||||
[ "$INITRD" ] || { [ -e "$default_fedora_initrd" ] && INITRD=$default_fedora_initrd; }
|
if [[ ! "$INITRD" ]]; then
|
||||||
[ "$INITRD" ] || { [ "$LOOKS_LIKE_DEBIAN" ] && [ -e "$default_debian_initrd" ] && INITRD=$default_debian_initrd; }
|
if [[ -e "$default_fedora_initrd" ]]; then
|
||||||
|
INITRD="$default_fedora_initrd"
|
||||||
|
elif [[ "$LOOKS_LIKE_DEBIAN" && -e "$default_debian_initrd" ]]; then
|
||||||
|
INITRD="$default_debian_initrd"
|
||||||
|
elif [[ "$LOOKS_LIKE_ARCH" && -e "$default_arch_initrd" ]]; then
|
||||||
|
INITRD="$default_arch_initrd"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
[ "$QEMU_SMP" ] || QEMU_SMP=1
|
[ "$QEMU_SMP" ] || QEMU_SMP=1
|
||||||
|
|
||||||
find_qemu_bin || return 1
|
find_qemu_bin || return 1
|
||||||
|
|
Loading…
Reference in a new issue