X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=faiserver-revm;h=ddd27a20b69e957937f3d1975b6d50383e173716;hb=db2ca58c3e327f73b64189dec14cf7e7a01b6d34;hp=6d598a6f3f084b1771e3f6fb3fa7ffa1cb7d9882;hpb=875cea0c266c7802b336f5a8b61b63e109e670fb;p=automated-distro-installer

diff --git a/faiserver-revm b/faiserver-revm
index 6d598a6..ddd27a2 100755
--- a/faiserver-revm
+++ b/faiserver-revm
@@ -2,10 +2,10 @@
 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")"; cd ${x%/*}
+x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
+cd ${x%/*}
 
 usage() {
     cat <<EOF
@@ -14,6 +14,8 @@ 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.
+
+WARNING: has hardcoded IP and name for for my local lan
 EOF
     exit $1
 }
@@ -22,7 +24,7 @@ case $1 in
 esac
 
 cleanup() { pxe-server :; }
-./debian-pxe-preseed -i 192.168.1.1 -u ian -g vda
+./debian-pxe-preseed -i 10.0.0.1 -u iank -g vda
 
 name=faiserver
 s virshrm $name ||: