arch fixes plus name subvols by distro in prep for multi-distro

[automated-distro-installer] / fai-redep

diff --git a/fai-redep b/fai-redep
index d7ba0043f9979f1292f620168417974c9f41d0e3..0c234597b34e5515de5113fc0aac9c1e5fe63551 100755 (executable)
--- a/fai-redep
+++ b/fai-redep
@@ -1,4 +1,5 @@
-#!/bin/bash -lx
+#!/bin/bash -l
+set -x
 
 # Deploy fai configuration to faiserver,
 # then start a virtual machine to test the config.
@@ -6,8 +7,10 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 
-ssh root@faiserver rm -rf /srv/fai/config/\*
-scp -r /a/bin/fai/fai/config root@faiserver:/srv/fai
+cd $(dirname $(readlink -f "$BASH_SOURCE"))
+
+ssh root@faiserver rm -rf /srv/fai/config
+scp -r fai/config root@faiserver:/srv/fai
 # fai example pass: fai
 #ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 
@@ -19,17 +22,12 @@ scp -r /a/bin/fai/fai/config root@faiserver:/srv/fai
 ssh root@faiserver tee -a /srv/fai/config/class/DEFAULT.var <<EOF
 ROOTPW='$(cat /p/shadow/standard)'
 EOF
+ssh root@faiserver tee -a /srv/fai/config/class/tp.var <<EOF
+ROOTPW='$(cat /p/shadow/traci-simple)'
+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
+s scp -r /q/root/luks /p/shadow/traci{,-simple} \
+  root@faiserver:/srv/fai/config/distro-install-common
 ssh root@faiserver chmod -R a+rX /srv/fai/config/distro-install-common
-
-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
-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 \
-  --disk path=/var/lib/libvirt/images/demohostb -w bridge=br0,mac=52:54:00:9c:ef:ad