summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 9cdabe865b..01d831520a 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -584,11 +584,15 @@ class BaseConfig(object):
584 if self.fstype in self.vmtypes: 584 if self.fstype in self.vmtypes:
585 return 585 return
586 586
587 # See if the user supplied a KERNEL option
588 if self.get('KERNEL'):
589 self.kernel = self.get('KERNEL')
590
587 # QB_DEFAULT_KERNEL is always a full file path 591 # QB_DEFAULT_KERNEL is always a full file path
588 kernel_name = os.path.basename(self.get('QB_DEFAULT_KERNEL')) 592 kernel_name = os.path.basename(self.get('QB_DEFAULT_KERNEL'))
589 593
590 # The user didn't want a kernel to be loaded 594 # The user didn't want a kernel to be loaded
591 if kernel_name == "none": 595 if kernel_name == "none" and not self.kernel:
592 return 596 return
593 597
594 deploy_dir_image = self.get('DEPLOY_DIR_IMAGE') 598 deploy_dir_image = self.get('DEPLOY_DIR_IMAGE')