[oe-commits] Patrick Ohly : runqemu: avoid image file name mismatches
git at git.openembedded.org
git at git.openembedded.org
Sat Sep 12 21:52:49 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 29e0aaa7345ca823bb4af2d4a870e98ac75e04e7
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=29e0aaa7345ca823bb4af2d4a870e98ac75e04e7
Author: Patrick Ohly <patrick.ohly at intel.com>
Date: Wed Sep 9 17:12:05 2015 +0200
runqemu: avoid image file name mismatches
Giving anything with -image in it as bootparams or in qemuparams (for
example, an additional -drive parameter with an image file or an
"-initrd .../core-image-minimal-initramfs-qemux86.cpio.gz") caused
runqemu to treat these parameters as names of the rootfs image file.
Matching *-image) after checking the current argument for more
specific cases like bootparams and qemuparams avoids this
misinterpretation of the command line parameters.
Signed-off-by: Patrick Ohly <patrick.ohly at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
scripts/runqemu | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index f16af9c..23cf5be 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -118,22 +118,6 @@ while true; do
[ -z "$FSTYPE" -o "$FSTYPE" = "$arg" ] && FSTYPE=$arg || \
error "conflicting FSTYPE types [$FSTYPE] and [$arg]"
;;
- *-image*)
- [ -z "$ROOTFS" ] || \
- error "conflicting ROOTFS args [$ROOTFS] and [$arg]"
- if [ -f "$arg" ]; then
- process_filename $arg
- elif [ -d "$arg" ]; then
- # Handle the case where the nfsroot dir has -image-
- # in the pathname
- echo "Assuming $arg is an nfs rootfs"
- FSTYPE=nfs
- ROOTFS=$arg
- else
- ROOTFS=$arg
- LAZY_ROOTFS="true"
- fi
- ;;
"ramfs")
FSTYPE=cpio.gz
RAMFS=true
@@ -192,6 +176,22 @@ while true; do
"publicvnc")
SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -vnc 0.0.0.0:0"
;;
+ *-image*)
+ [ -z "$ROOTFS" ] || \
+ error "conflicting ROOTFS args [$ROOTFS] and [$arg]"
+ if [ -f "$arg" ]; then
+ process_filename $arg
+ elif [ -d "$arg" ]; then
+ # Handle the case where the nfsroot dir has -image-
+ # in the pathname
+ echo "Assuming $arg is an nfs rootfs"
+ FSTYPE=nfs
+ ROOTFS=$arg
+ else
+ ROOTFS=$arg
+ LAZY_ROOTFS="true"
+ fi
+ ;;
"") break ;;
*)
# A directory name is an nfs rootfs
More information about the Openembedded-commits
mailing list