X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=faiserver-revm;h=65a23d62c6c000d87a738e6edbc1c76db1601fa1;hb=836348b3deca3d4544bcf4ece81d8609740da550;hp=1065f3b84b45fd3648114aa6c74ce2819f153c82;hpb=bf19e9969f50a637c8fabf724eb9e292da472e01;p=automated-distro-installer

diff --git a/faiserver-revm b/faiserver-revm
index 1065f3b..65a23d6 100755
--- a/faiserver-revm
+++ b/faiserver-revm
@@ -1,16 +1,25 @@
 #!/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
-cleanup() { :; }
-trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+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.
 
-cd "${BASH_SOURCE%/*}"
+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
@@ -34,6 +43,6 @@ done
 
 # note: with a vm, pxe boot is turned off in the bios after it's first reboot.
 cleanup() { :; }
-./pxe-server :
+./pxe-server
 
 ssh $opts root@faiserver ./faiserver-setup