X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=faiserver-revm;h=a0a0bb8b421ecf11ea4b666ec683bff61c386944;hb=83828fe2683227f4d8ecb2343eff28439741b490;hp=2b2864ae4e3e239a1dab8940b55df87fc06dff64;hpb=23bf2f3666becf9d3c219af1eaea08b4cf843492;p=automated-distro-installer

diff --git a/faiserver-revm b/faiserver-revm
index 2b2864a..a0a0bb8 100755
--- a/faiserver-revm
+++ b/faiserver-revm
@@ -1,14 +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 $?" >&2' ERR
+cleanup() { :; }
+trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-cd "${BASH_SOURCE%/*}"
+x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
 
+cleanup() { pxe-server :; }
 ./debian-pxe-preseed -i 192.168.1.1 -u ian -g vda
 
 name=faiserver
@@ -28,6 +32,8 @@ while ! scp $opts faiserver-setup root@faiserver:; do
     sleep 5
 done
 
-./pxe-server :
+# 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