fix keeping non system fses and idempotency

[automated-distro-installer] / fai-redep

diff --git a/fai-redep b/fai-redep
index 935e96c5af2b696ac375b70ab6ff00f4d8962250..d7ba0043f9979f1292f620168417974c9f41d0e3 100755 (executable)
--- a/fai-redep
+++ b/fai-redep
@@ -22,14 +22,13 @@ EOF
 scp ~/.ssh/id_rsa.pub \
     root@faiserver:/srv/fai/config/files/home/ian/.ssh/authorized_keys/GRUB_PC
 s scp -r /q/root/luks root@faiserver:/srv/fai/config/distro-install-common
-ssh root@faiserver chmod -R a+r /srv/fai/config/distro-install-common
+ssh root@faiserver chmod -R a+rX /srv/fai/config/distro-install-common
 
 s virshrm demohost ||:
-# this one doesn't need to be done every time
-s qemu-img create -o preallocation=metadata -f qcow2 \
-  /var/lib/libvirt/images/demohost 30G
-s qemu-img create -o preallocation=metadata -f qcow2 \
-  /var/lib/libvirt/images/demohostb 30G
+
+for f in /var/lib/libvirt/images/demohost{,b}; do
+    [[ -e $f ]] || s qemu-img create -o preallocation=metadata -f qcow2 $f 30G
+done
 # osinfo-query os | gr jessie
 s virt-install --os-variant debian8 --cpu host -n demohost --pxe -r 2048 --vcpus 1 \
   --disk path=/var/lib/libvirt/images/demohost \