From ee2bbf8385ec5cfe311a2639c4f57dd1f460bd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Sz=C3=B6ll=C5=91si?= Date: Thu, 26 Oct 2017 21:19:42 +0200 Subject: [PATCH] Don't hardcode kernel flavor when launching qemu (#827) This makes qemu work again with linux-postmarketos-stable (we renamed it recently). --- pmb/qemu/run.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pmb/qemu/run.py b/pmb/qemu/run.py index 2918291e..2162b139 100644 --- a/pmb/qemu/run.py +++ b/pmb/qemu/run.py @@ -120,10 +120,12 @@ def qemu_command(args, arch, device, img_path, config): telnet_port = str(args.port + 1) telnet_debug_port = str(args.port + 2) - rootfs = args.work + "/chroot_rootfs_" + device + suffix = "rootfs_" + device + rootfs = args.work + "/chroot_" + suffix + flavor = pmb.chroot.other.kernel_flavor_autodetect(args, suffix) command = [qemu_bin] - command += ["-kernel", rootfs + "/boot/vmlinuz-postmarketos"] - command += ["-initrd", rootfs + "/boot/initramfs-postmarketos"] + command += ["-kernel", rootfs + "/boot/vmlinuz-" + flavor] + command += ["-initrd", rootfs + "/boot/initramfs-" + flavor] command += ["-append", '"' + cmdline + '"'] command += ["-m", str(args.memory)] command += ["-netdev",