summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2012-08-23 13:23:07 +0200
committerDominique Martinet <asmadeus@codewreck.org>2012-08-23 13:23:07 +0200
commitdd2dc461ee2091caed4f0b9edeb4b7595c86c12e (patch)
tree0458cab015b961defcb20eb5ab2ecaf317313e2a
parent36729c6f33e8a3f984513c135182afda59803bd6 (diff)
fixed network boot with no hard drive. relies on there being no 'n' in '-boot order='... any better idea?
-rwxr-xr-xkvm-wrapper.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/kvm-wrapper.sh b/kvm-wrapper.sh
index ada33ce..c8dac7d 100755
--- a/kvm-wrapper.sh
+++ b/kvm-wrapper.sh
@@ -433,7 +433,8 @@ function kvm_start_vm ()
[[ -n "$KVM_DISK4" ]] && KVM_DRIVES+=" -drive if=none,id=disk4,file=\"$KVM_DISK4\"$KVM_DRIVE_OPT -device ${KVM_DRIVE4_IF:-$KVM_DRIVE_IF},drive=disk4"
[[ -n "$KVM_CDROM" ]] && KVM_DRIVES="$KVM_DRIVES -cdrom \"$KVM_CDROM\""
- [[ "$KVM_DRIVES" == "" ]] && [[ "$KVM_BOOTDEVICE" != "n" ]] && fail_exit "Your VM $VM_NAME should at least use one cdrom or harddisk drive !\nPlease check your conf file :\n$VM_DESCRIPTOR"
+ [[ "$KVM_DRIVES" == "" ]] && echo "$KVM_BOOTDEVICE" | grep -qv "n" && \
+ fail_exit "Your VM $VM_NAME should at least use one cdrom or harddisk drive !\nPlease check your conf file :\n$VM_DESCRIPTOR"
local LINUXBOOT=""
[[ -n "$KVM_KERNEL" ]] && LINUXBOOT="$LINUXBOOT -kernel \"$KVM_KERNEL\""
[[ -n "$KVM_INITRD" ]] && LINUXBOOT="$LINUXBOOT -initrd \"$KVM_INITRD\""