Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

pmb.qemu: drop --flavor option (!1886)

Browse source 
Since we ask for the kernel flavor during init, only the chosen kernel is
installed, hence there's no need to specify a different one.
This commit is contained in:
Daniele Debernardi 2020-03-11 22:01:07 +01:00 • committed by Oliver Smith
parent a76897b4a1
commit 9718320829
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pmb/parse/arguments.py
View file

@ -121,8 +121,6 @@ def arguments_qemu(subparser):
help="guest RAM (default: 1024)")
ret.add_argument("-p", "--port", type=int, default=2222,
help="SSH port (default: 2222)")
ret.add_argument("--flavor", help="name of the kernel flavor (run 'pmbootstrap flasher list_flavors'"
" to get a list of all installed flavors")
ret.add_argument("--no-kvm", dest="qemu_kvm", default=True, action='store_false',
help="Avoid using hardware-assisted virtualization with KVM "

5
pmb/qemu/run.py
View file

@ -83,10 +83,7 @@ def command_qemu(args, arch, img_path):
suffix = "rootfs_" + args.device
rootfs = args.work + "/chroot_" + suffix
if args.flavor:
flavor = args.flavor
else:
flavor = pmb.chroot.other.kernel_flavors_installed(args, suffix)[0]
flavor = pmb.chroot.other.kernel_flavors_installed(args, suffix)[0]
if args.host_qemu:
qemu_bin = which_qemu(args, arch)