From 6d07a72356f9a8ea76b6cda9159d3ca4743028d9 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Thu, 25 Jun 2020 10:17:10 -0700 Subject: runqemu: If using a vmtype image do not add the -no-reboot flag There is no way to use runqemu and turn off the no-reboot flag with a command line argument. If someone really wants it back it can be added with the qemuparams="" argument. Also if you use the "halt -p" from user space, the qemu will exit when it is complete. It is impossible to test self deploying image with runqemu if you cannot reboot the device. One might argue that you can run runqemu in a loop, but that defeats the purpose of having a wrapper around a tool that already does what is needed in the first place. For the vmtype images, the -no-reboot flag should not be added. Signed-off-by: Jason Wessel Signed-off-by: Richard Purdie --- scripts/runqemu | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts/runqemu') diff --git a/scripts/runqemu b/scripts/runqemu index 85f323a712..f2168c18a3 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1241,7 +1241,9 @@ class BaseConfig(object): vm_drive = '-drive if=virtio,file=%s,format=%s' % (self.rootfs, rootfs_format) # All branches above set vm_drive. - self.rootfs_options = '%s -no-reboot' % vm_drive + self.rootfs_options = vm_drive + if not self.fstype in self.vmtypes: + self.rootfs_options += ' -no-reboot' self.kernel_cmdline = 'root=%s rw' % (self.get('QB_KERNEL_ROOT')) if self.fstype == 'nfs': -- cgit 1.2.3-korg