diff options
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 82711606f6..a4d9a2306b 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -28,7 +28,7 @@ usage() { | |||
28 | echo " MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified)" | 28 | echo " MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified)" |
29 | echo " RAMFS - boot a ramfs-based image" | 29 | echo " RAMFS - boot a ramfs-based image" |
30 | echo " ISO - boot an ISO image" | 30 | echo " ISO - boot an ISO image" |
31 | echo " VM - boot a vmdk image" | 31 | echo " VM - boot a virtual machine image (= a file representing a full disk with boot loader)" |
32 | echo " Simplified QEMU command-line options can be passed with:" | 32 | echo " Simplified QEMU command-line options can be passed with:" |
33 | echo " nographic - disables video console" | 33 | echo " nographic - disables video console" |
34 | echo " serial - enables a serial console on /dev/ttyS0" | 34 | echo " serial - enables a serial console on /dev/ttyS0" |
@@ -94,7 +94,7 @@ process_filename() { | |||
94 | error "conflicting FSTYPE types [$FSTYPE] and [$EXT]" | 94 | error "conflicting FSTYPE types [$FSTYPE] and [$EXT]" |
95 | fi | 95 | fi |
96 | ;; | 96 | ;; |
97 | /vmdk/) | 97 | /hddimg/|/hdddirect/|/vmdk/) |
98 | FSTYPE=$EXT | 98 | FSTYPE=$EXT |
99 | VM=$filename | 99 | VM=$filename |
100 | ;; | 100 | ;; |
@@ -114,7 +114,7 @@ while true; do | |||
114 | [ -z "$MACHINE" ] && MACHINE=$arg || \ | 114 | [ -z "$MACHINE" ] && MACHINE=$arg || \ |
115 | error "conflicting MACHINE types [$MACHINE] and [$arg]" | 115 | error "conflicting MACHINE types [$MACHINE] and [$arg]" |
116 | ;; | 116 | ;; |
117 | "ext2" | "ext3" | "ext4" | "jffs2" | "nfs" | "btrfs") | 117 | "ext2" | "ext3" | "ext4" | "jffs2" | "nfs" | "btrfs" | "hddimg" | "hdddirect" ) |
118 | [ -z "$FSTYPE" -o "$FSTYPE" = "$arg" ] && FSTYPE=$arg || \ | 118 | [ -z "$FSTYPE" -o "$FSTYPE" = "$arg" ] && FSTYPE=$arg || \ |
119 | error "conflicting FSTYPE types [$FSTYPE] and [$arg]" | 119 | error "conflicting FSTYPE types [$FSTYPE] and [$arg]" |
120 | ;; | 120 | ;; |
@@ -235,12 +235,12 @@ if [ "$FSTYPE" = "nfs" -a -z "$ROOTFS" ]; then | |||
235 | fi | 235 | fi |
236 | 236 | ||
237 | if [ -z "$MACHINE" ]; then | 237 | if [ -z "$MACHINE" ]; then |
238 | if [ "x$FSTYPE" = "xvmdk" ]; then | 238 | if [ "x$FSTYPE" = "xvmdk" ] || [ "x$FSTYPE" = "xhddimg" ] || [ "x$FSTYPE" = "xhdddirect" ]; then |
239 | MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` | 239 | MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` |
240 | if [ -z "$MACHINE" ]; then | 240 | if [ -z "$MACHINE" ]; then |
241 | error "Unable to set MACHINE from vmdk filename [$VM]" | 241 | error "Unable to set MACHINE from image filename [$VM]" |
242 | fi | 242 | fi |
243 | echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]" | 243 | echo "Set MACHINE to [$MACHINE] based on image [$VM]" |
244 | else | 244 | else |
245 | MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` | 245 | MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` |
246 | if [ -z "$MACHINE" ]; then | 246 | if [ -z "$MACHINE" ]; then |
@@ -436,7 +436,7 @@ if [ -e "$ROOTFS" -a -z "$FSTYPE" ]; then | |||
436 | fi | 436 | fi |
437 | fi | 437 | fi |
438 | 438 | ||
439 | if [ -z "$KERNEL" -a "x$FSTYPE" != "xvmdk" ]; then | 439 | if [ -z "$KERNEL" -a "x$FSTYPE" != "xvmdk" -a "x$FSTYPE" != "xhddimg" -a "x$FSTYPE" != "xhdddirect" ]; then |
440 | setup_path_vars 1 | 440 | setup_path_vars 1 |
441 | eval kernel_file=\$${machine2}_DEFAULT_KERNEL | 441 | eval kernel_file=\$${machine2}_DEFAULT_KERNEL |
442 | KERNEL=$DEPLOY_DIR_IMAGE/$kernel_file | 442 | KERNEL=$DEPLOY_DIR_IMAGE/$kernel_file |
@@ -462,10 +462,14 @@ fi | |||
462 | if [ "$LAZY_ROOTFS" = "true" ]; then | 462 | if [ "$LAZY_ROOTFS" = "true" ]; then |
463 | setup_path_vars 1 | 463 | setup_path_vars 1 |
464 | echo "Assuming $ROOTFS really means $DEPLOY_DIR_IMAGE/$ROOTFS-$MACHINE.$FSTYPE" | 464 | echo "Assuming $ROOTFS really means $DEPLOY_DIR_IMAGE/$ROOTFS-$MACHINE.$FSTYPE" |
465 | ROOTFS=$DEPLOY_DIR_IMAGE/$ROOTFS-$MACHINE.$FSTYPE | 465 | if [ "$FSTYPE" = "hddimg" -o "x$FSTYPE" = "xhdddirect" ]; then |
466 | VM=$DEPLOY_DIR_IMAGE/$ROOTFS-$MACHINE.$FSTYPE | ||
467 | else | ||
468 | ROOTFS=$DEPLOY_DIR_IMAGE/$ROOTFS-$MACHINE.$FSTYPE | ||
469 | fi | ||
466 | fi | 470 | fi |
467 | 471 | ||
468 | if [ -z "$ROOTFS" -a "x$FSTYPE" != "xvmdk" ]; then | 472 | if [ -z "$ROOTFS" -a "x$FSTYPE" != "xvmdk" -a "x$FSTYPE" != "xhddimg" -a "x$FSTYPE" != "xhdddirect" ]; then |
469 | setup_path_vars 1 | 473 | setup_path_vars 1 |
470 | T=$DEPLOY_DIR_IMAGE | 474 | T=$DEPLOY_DIR_IMAGE |
471 | eval rootfs_list=\$${machine2}_DEFAULT_ROOTFS | 475 | eval rootfs_list=\$${machine2}_DEFAULT_ROOTFS |
@@ -481,7 +485,7 @@ ROOTFS=`readlink -f $ROOTFS` | |||
481 | 485 | ||
482 | echo "" | 486 | echo "" |
483 | echo "Continuing with the following parameters:" | 487 | echo "Continuing with the following parameters:" |
484 | if [ "x$FSTYPE" != "xvmdk" ]; then | 488 | if [ "x$FSTYPE" != "xvmdk" -a "x$FSTYPE" != "xhddimg" -a "x$FSTYPE" != "xhdddirect" ]; then |
485 | echo "KERNEL: [$KERNEL]" | 489 | echo "KERNEL: [$KERNEL]" |
486 | echo "ROOTFS: [$ROOTFS]" | 490 | echo "ROOTFS: [$ROOTFS]" |
487 | else | 491 | else |