diff options
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 17219563a8..4fa2867e73 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -660,7 +660,15 @@ class BaseConfig(object): | |||
660 | logger.info('Running %s...' % cmd) | 660 | logger.info('Running %s...' % cmd) |
661 | qbs = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') | 661 | qbs = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') |
662 | if qbs: | 662 | if qbs: |
663 | self.qemuboot = qbs.split()[0] | 663 | for qb in qbs.split(): |
664 | # Don't use initramfs when other choices unless fstype is ramfs | ||
665 | if '-initramfs-' in os.path.basename(qb) and self.fstype != 'cpio.gz': | ||
666 | continue | ||
667 | self.qemuboot = qb | ||
668 | break | ||
669 | if not self.qemuboot: | ||
670 | # Use the first one when no choice | ||
671 | self.qemuboot = qbs.split()[0] | ||
664 | self.qbconfload = True | 672 | self.qbconfload = True |
665 | 673 | ||
666 | if not self.qemuboot: | 674 | if not self.qemuboot: |