diff options
Diffstat (limited to 'build-vm-kvm')
| -rw-r--r-- | build-vm-kvm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build-vm-kvm b/build-vm-kvm index 641bc4d..c557317 100644 --- a/build-vm-kvm +++ b/build-vm-kvm @@ -22,6 +22,7 @@ ################################################################ kvm_bin=/usr/bin/qemu-kvm +test ! -x $kvm_bin -a -x /usr/bin/kvm && kvm_bin=/usr/bin/kvm kvm_console=ttyS0 # assume virtio support by default @@ -214,7 +215,7 @@ vm_verify_options_kvm() { vm_startup_kvm() { qemu_bin="$kvm_bin" - qemu_args=(-drive file="$VM_IMAGE",format=raw,if=none,id=disk,serial=0,cache=unsafe -device "$kvm_device",drive=disk) + qemu_args=(-drive file="$VM_IMAGE",format=raw,if=none,id=disk,cache=unsafe -device "$kvm_device",drive=disk,serial=0) if [ -n "$VM_USER" ] ; then getent passwd "$VM_USER" > /dev/null || complain 22 "cannot find KVM user '$VM_USER'" else @@ -223,7 +224,7 @@ vm_startup_kvm() { fi [ -n "$VM_USER" ] && kvm_options="$kvm_options -runas $VM_USER" if test -n "$VM_SWAP" ; then - qemu_args=("${qemu_args[@]}" -drive file="$VM_SWAP",format=raw,if=none,id=swap,serial=1,cache=unsafe -device "$kvm_device",drive=swap) + qemu_args=("${qemu_args[@]}" -drive file="$VM_SWAP",format=raw,if=none,id=swap,cache=unsafe -device "$kvm_device",drive=swap,serial=1) fi # the serial console device needs to be compiled into the target kernel # which is why we can not use virtio-serial on other platforms |