diff options
Diffstat (limited to 'debvm-run')
| -rwxr-xr-x | debvm-run | 27 |
1 files changed, 18 insertions, 9 deletions
@@ -66,11 +66,11 @@ if command -v elf-arch >/dev/null 2>&1; then VMARCH=$(elf-arch "$KERNELTMP") fi case "$VMARCH" in - arm64|s390x) - DISKDEV=vda + amd64|i386) + DISKDEV=sda ;; *) - DISKDEV=sda + DISKDEV=vda ;; esac @@ -99,19 +99,28 @@ else QEMU=qemu-system-aarch64 set -- -machine virt -cpu max "$@" ;; + arm|armel|armhf) + QEMU=qemu-system-arm + set -- -machine virt -cpu max "$@" + ;; *) QEMU="qemu-system-$VMARCH" ;; esac fi -if test "$VMARCH" = arm64; then - set -- -nographic "$@" -elif test "$VMARCH" = s390x; then - set -- -M s390-ccw-virtio -nographic "$@" -elif test -z "$GRAPHICAL"; then - KERNEL_CMDLINE="$KERNEL_CMDLINE console=ttyS0" + +if test -z "$GRAPHICAL"; then set -- -nographic "$@" + case "$VMARCH" in + s390x) + set -- -M s390-ccw-virtio "$@" + ;; + amd64) + KERNEL_CMDLINE="$KERNEL_CMDLINE console=ttyS0" + ;; + esac fi + if test -n "$SSHPORT"; then NETDEV="$NETDEV,hostfwd=tcp:127.0.0.1:$SSHPORT-:22" fi |