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

diff --git a/faiserver-revm b/faiserver-revm
index a0a0bb8..6e4613f 100755
--- a/faiserver-revm
+++ b/faiserver-revm
@@ -1,19 +1,29 @@
-#!/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.
+#!/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")"; source "${x%/*}/bash-trace"
+cd ${x%/*}
 
-x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
+usage() {
+    cat <<EOF
+usage: ${0##*/} [-h|--help]
+Create a vm which is a fai server.
 
-cleanup() { pxe-server :; }
-./debian-pxe-preseed -i 192.168.1.1 -u ian -g vda
+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
+}
+case $1 in
+    -h|--help) usage ;;
+esac
+
+errcatch-cleanup() { pxe-server :; }
+./debian-pxe-preseed -i 10.0.0.1 -u iank -g vda
 
 name=faiserver
 s virshrm $name ||:
@@ -33,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() { :; }
+errcatch-cleanup() { :; }
 ./pxe-server
 
 ssh $opts root@faiserver ./faiserver-setup