X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=faiserver-revm;h=65a23d62c6c000d87a738e6edbc1c76db1601fa1;hb=d29d21017de635db1d05769144db56f44addd055;hp=1f84b0dd5ab928dc2ef5d785752aba8ededdef3b;hpb=2e975979fa5bad84f3d2a84a9d62fbfd8793374c;p=automated-distro-installer

diff --git a/faiserver-revm b/faiserver-revm
index 1f84b0d..65a23d6 100755
--- a/faiserver-revm
+++ b/faiserver-revm
@@ -1,12 +1,27 @@
 #!/bin/bash -l
-# create a vm which is a fai server
 set -x
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
-
-cd $(dirname $(readlink -f "$BASH_SOURCE"))
-
+cleanup() { :; }; _errcatch_cleanup=cleanup
+
+x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
+cd ${x%/*}
+
+usage() {
+    cat <<EOF
+usage: ${0##*/} [-h|--help]
+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. That mac is a randomly generated one in the libvirt range.
+EOF
+    exit $1
+}
+case $1 in
+    -h|--help) usage ;;
+esac
+
+cleanup() { pxe-server :; }
 ./debian-pxe-preseed -i 192.168.1.1 -u ian -g vda
 
 name=faiserver
@@ -15,12 +30,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 ./faiserver-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