X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=faiserver-revm;h=78427231df54960f855e2c15b5738c20488742a8;hb=c90a6fcdae53853a1e7d74dfcfa5d86cb7d81096;hp=eeae0b90373d426e087f3a326b024f146f255347;hpb=a43d3eec943c5f0491b300214a3c744d31a6e542;p=automated-distro-installer

diff --git a/faiserver-revm b/faiserver-revm
index eeae0b9..7842723 100755
--- a/faiserver-revm
+++ b/faiserver-revm
@@ -1,11 +1,18 @@
 #!/bin/bash -l
+# Usage: faiserver-revm
+# Create a vm which is a fai server.
+#
+# This assumes you've set the dhcp server to make
+# 52:54:00:56:09:f9 be faiserver.
 set -x
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+cleanup() { :; }
+trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-cd $(dirname $(readlink -f "$BASH_SOURCE"))
+cd "${BASH_SOURCE%/*}"
 
+cleanup() { pxe-server :; }
 ./debian-pxe-preseed -i 192.168.1.1 -u ian -g vda
 
 name=faiserver
@@ -14,12 +21,19 @@ s virshrm $name ||:
 f=/var/lib/libvirt/images/${name}
 s qemu-img create -o preallocation=metadata -f qcow2 $f 30G
 
+# uniq because virt-viewer spams me with pointless gtk warnings
 s virt-install --os-variant debian8 --cpu host -n $name --pxe -r 1024 --vcpus 1 \
-  --disk $f -w bridge=br0,mac=52:54:00:56:09:f9 &
+  --disk $f -w bridge=br0,mac=52:54:00:56:09:f9 |& sed "/^ *$/d" | uniq &
 
 sleep $((60*6)) # takes like 10x as long as a fai install!
-while ! scp fai-setup root@faiserver:; do
+
+opts="-oStrictHostKeyChecking=false -oUserKnownHostsFile=/dev/null"
+while ! scp $opts faiserver-setup root@faiserver:; do
     sleep 5
 done
 
-ssh root@faiserver ./fai-setup
+# note: with a vm, pxe boot is turned off in the bios after it's first reboot.
+cleanup() { :; }
+./pxe-server
+
+ssh $opts root@faiserver ./faiserver-setup