kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

run-qemu: default kernel to "/lib/modules/${KVERSION}/vmlinuz" 

newer Fedora kernel install the kernel to /lib/modules
master
Harald Hoyer 2015-06-10 19:39:41 +02:00
parent 8ff624df9f
commit 97ff396a97
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/TEST-16-DMSQUASH/test.sh
View File

@ -74,7 +74,17 @@ test_setup() {
inst_simple /etc/os-release inst_simple /etc/os-release
inst ./test-init.sh /sbin/init inst ./test-init.sh /sbin/init
inst "$TESTDIR"/initramfs.testing "/boot/initramfs-$KVERSION.img" inst "$TESTDIR"/initramfs.testing "/boot/initramfs-$KVERSION.img"
inst /boot/vmlinuz-"$KVERSION" [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id

VMLINUZ="/lib/modules/${KVERSION}/vmlinuz"
if ! [[ -e $VMLINUZ ]]; then
if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
VMLINUZ="/boot/${MACHINE_ID}/$KVERSION/linux"
fi
fi
[[ -e $VMLINUZ ]] || VMLINUZ="/boot/vmlinuz-${KVERSION}"

inst "$VMLINUZ" "/boot/vmlinuz-${KVERSION}"
find_binary plymouth >/dev/null && inst_multiple plymouth find_binary plymouth >/dev/null && inst_multiple plymouth
cp -a -- /etc/ld.so.conf* "$initdir"/etc cp -a -- /etc/ld.so.conf* "$initdir"/etc
sudo ldconfig -r -- "$initdir" sudo ldconfig -r -- "$initdir"

10
test/run-qemu
View File

@ -17,12 +17,16 @@ $(lsmod | grep -q '^kqemu ') && BIN=/usr/bin/qemu && ARGS="-kernel-kqemu "


KVERSION=${KVERSION-$(uname -r)} KVERSION=${KVERSION-$(uname -r)}


[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id VMLINUZ="/lib/modules/${KVERSION}/vmlinuz"


if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then if ! [ -f "$VMLINUZ" ]; then
[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id

if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
VMLINUZ="/boot/${MACHINE_ID}/$KVERSION/linux" VMLINUZ="/boot/${MACHINE_ID}/$KVERSION/linux"
else else
VMLINUZ="/boot/vmlinuz-${KVERSION}" VMLINUZ="/boot/vmlinuz-${KVERSION}"
fi
fi fi


exec sudo $BIN $ARGS -kernel $VMLINUZ "$@" exec sudo $BIN $ARGS -kernel $VMLINUZ "$@"