X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-redep;h=3e1306783b8fb535427d02b48890698a18b1809c;hb=a129832a849aa87163b866982c214bbdd7314a52;hp=935e96c5af2b696ac375b70ab6ff00f4d8962250;hpb=146686eb0d97bab588a5912e1994835001e5b459;p=automated-distro-installer

diff --git a/fai-redep b/fai-redep
index 935e96c..3e13067 100755
--- a/fai-redep
+++ b/fai-redep
@@ -19,18 +19,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
-ssh root@faiserver chmod -R a+r /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
-# 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
+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