summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2015-07-02 18:24:47 +0200
committerDominique Martinet <asmadeus@codewreck.org>2015-07-02 18:26:37 +0200
commitd12dbcdf70b0143370a3efb476dae01f6fad189c (patch)
treec7e16d61dd260f75a59f637f915891458055616e
parent87231ffe6e2df4e561b2bf2dba219cf8015c09ff (diff)
fixed rundisk for blockdevs... also, s/echo/eval/; do we want it in a screen?
-rwxr-xr-xkvm-wrapper.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/kvm-wrapper.sh b/kvm-wrapper.sh
index 85a798d..ab625e5 100755
--- a/kvm-wrapper.sh
+++ b/kvm-wrapper.sh
@@ -660,11 +660,12 @@ function kvm_run_disk ()
require_exec "$KVM_BIN"
KVM_DISK[0]="$1"
prepare_disks
- test_file_rw "${KVM_DISK[0]}" || fail_exit "Error: Couldn't read/write image file:\n${KVM_DISK[0]}"
+ test_file_rw "${KVM_DISK[0]}" || test_blockdev_rw "${KVM_DISK[0]}" || fail_exit "Error: Couldn't read/write image file:\n${KVM_DISK[0]}"
# Build kvm exec string
local EXEC_STRING="$KVM_BIN -net nic,model=rtl8139,macaddr=`random_mac` -net user -hda ${KVM_DISK[0]} -boot c $KVM_KEYMAP $KVM_OUTPUT $KVM_ADDITIONNAL_PARAMS"
echo "$EXEC_STRING"
+ eval "$EXEC_STRING"
unprepare_disks