scrap mdadm, various fixes

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index 3b3e003c7e35ba20c0960c29de98ce4b59aadfe3..af8bc365c48fb01c0f4f583854c275baaa76dfb5 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -6,6 +6,9 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 
+new_disk=false
+[[ ! $1 ]] || new_disk=true
+
 cd "${BASH_SOURCE%/*}"
 
 ./fai-redep
@@ -13,7 +16,9 @@ cd "${BASH_SOURCE%/*}"
 s virshrm demohost ||:
 
 for f in /var/lib/libvirt/images/demohost{,b}; do
-    [[ -e $f ]] || s qemu-img create -o preallocation=metadata -f qcow2 $f 30G
+    if $new_disk || [[ ! -e $f ]]; then
+        s qemu-img create -o preallocation=metadata -f qcow2 $f 30G
+    fi
 done
 # osinfo-query os | gr jessie
 s virt-install --os-variant debian8 --cpu host -n demohost --pxe -r 2048 --vcpus 1 \