X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=faiserver-revm;h=65a23d62c6c000d87a738e6edbc1c76db1601fa1;hb=5f680f6bea2faae10ca8e5ccea0d08d18ccc9aa1;hp=a0a0bb8b421ecf11ea4b666ec683bff61c386944;hpb=83828fe2683227f4d8ecb2343eff28439741b490;p=automated-distro-installer

diff --git a/faiserver-revm b/faiserver-revm
index a0a0bb8..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
-
-x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
+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