fix pxe server leaving background procs

[automated-distro-installer] / faiserver-revm

diff --git a/faiserver-revm b/faiserver-revm
index 2b2864ae4e3e239a1dab8940b55df87fc06dff64..e5237c3cc9306d6f8843703c4dfb83bf1d1689c4 100755 (executable)
--- a/faiserver-revm
+++ b/faiserver-revm
@@ -5,10 +5,12 @@
 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%/*}"
 
+cleanup() { pxe-server :; }
 ./debian-pxe-preseed -i 192.168.1.1 -u ian -g vda
 
 name=faiserver
@@ -28,6 +30,8 @@ while ! scp $opts faiserver-setup root@faiserver:; do
     sleep 5
 done
 
+# 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