[oe-commits] [openembedded-core] 22/24: runqemu: simplify checking for iso and ramfs
git at git.openembedded.org
git at git.openembedded.org
Mon Mar 21 12:43:56 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit af0010415d4e80e058657fc88cda016048212c07
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Wed Mar 2 17:50:05 2016 -0800
runqemu: simplify checking for iso and ramfs
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
scripts/runqemu | 7 +------
scripts/runqemu-internal | 4 ++--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index d95711b..b4cc9de 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -125,7 +125,7 @@ while true; do
[ -z "$MACHINE" -o "$MACHINE" = "$arg" ] && MACHINE=$arg || \
error "conflicting MACHINE types [$MACHINE] and [$arg]"
;;
- "ext"[234] | "jffs2" | "nfs" | "btrfs")
+ "ext"[234] | "jffs2" | "nfs" | "btrfs" | "iso")
check_fstype_conflicts $arg
;;
"hddimg" | "hdddirect" | "wic" | "vmdk" | "qcow2" | "vdi")
@@ -134,12 +134,7 @@ while true; do
;;
"ramfs")
FSTYPE=cpio.gz
- RAMFS=true
;;
- "iso")
- FSTYPE=iso
- ISOFS=true
- ;;
"nographic")
SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -nographic"
SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0"
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 89a1e1b..6fa93c9 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -593,12 +593,12 @@ if [ "$MACHINE" = "qemuzynq" ]; then
fi
fi
-if [ "x$RAMFS" = "xtrue" ]; then
+if [ "$FSTYPE" = "cpio.gz" ]; then
QEMUOPTIONS="-initrd $ROOTFS -nographic"
KERNCMDLINE="root=/dev/ram0 console=ttyS0 debugshell"
fi
-if [ "x$ISOFS" = "xtrue" ]; then
+if [ "$FSTYPE" = "iso" ]; then
QEMUOPTIONS="$QEMU_NETWORK_CMD -cdrom $ROOTFS $QEMU_UI_OPTIONS"
fi
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list