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

diff --git a/faiserver-revm b/faiserver-revm
index 6d598a6..bb4650e 100755
--- a/faiserver-revm
+++ b/faiserver-revm
@@ -1,11 +1,10 @@
-#!/bin/bash -l
+#!/bin/bash
+# Copyright (C) 2019 Ian Kelling
+# SPDX-License-Identifier: AGPL-3.0-or-later
 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%/*}
+x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
+cd ${x%/*}
 
 usage() {
     cat <<EOF
@@ -14,6 +13,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
 }
@@ -21,8 +22,8 @@ case $1 in
     -h|--help) usage ;;
 esac
 
-cleanup() { pxe-server :; }
-./debian-pxe-preseed -i 192.168.1.1 -u ian -g vda
+err-cleanup() { pxe-server :; }
+./debian-pxe-preseed -i 10.0.0.1 -u iank -g vda
 
 name=faiserver
 s virshrm $name ||:
@@ -42,7 +43,7 @@ while ! scp $opts faiserver-setup root@faiserver:; do
 done
 
 # note: with a vm, pxe boot is turned off in the bios after it's first reboot.
-cleanup() { :; }
+err-cleanup() { :; }
 ./pxe-server
 
 ssh $opts root@faiserver ./faiserver-setup