aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-03-02 17:50:05 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-23 14:24:25 +0000
commit69a1fca4374797dea56035ce56a17441a2ca9280 (patch)
tree8e8fbc3c7292b6046fc059feecdcc98ebfc873d3 /scripts
parent0f8306c77b4ebed1ff127b0786b7109abf0d57cd (diff)
downloadopenembedded-core-contrib-69a1fca4374797dea56035ce56a17441a2ca9280.tar.gz
runqemu: simplify checking for iso and ramfs
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu7
-rwxr-xr-xscripts/runqemu-internal4
2 files changed, 3 insertions, 8 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index d95711b191..b4cc9de139 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 89a1e1ba27..6fa93c9d07 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