X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=faiserver-revm;h=ddd27a20b69e957937f3d1975b6d50383e173716;hb=HEAD;hp=6e4613f80f7e1a9e153db549489e5e955b98c3db;hpb=78a1427fc167ccee73d448054a9c40c19d737ed3;p=automated-distro-installer

diff --git a/faiserver-revm b/faiserver-revm
index 6e4613f..6507334 100755
--- a/faiserver-revm
+++ b/faiserver-revm
@@ -1,14 +1,26 @@
 #!/bin/bash
-# Copyright (C) 2019 Ian Kelling
-# SPDX-License-Identifier: AGPL-3.0-or-later
-set -x
+# This file is part of Ian Kelling's automated-distro-installer
+# Copyright (C) 2024 Ian Kelling
 
-x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
-cd ${x%/*}
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+set -e; . /usr/local/lib/bash-bear; set +e
 
 usage() {
     cat <<EOF
-usage: ${0##*/} [-h|--help]
+usage: this-script [-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
@@ -19,10 +31,11 @@ EOF
     exit $1
 }
 case $1 in
-    -h|--help) usage ;;
+    -h|--help) usage 0 ;;
+    *) usage 1 ;;
 esac
 
-errcatch-cleanup() { pxe-server :; }
+err-cleanup() { pxe-server :; }
 ./debian-pxe-preseed -i 10.0.0.1 -u iank -g vda
 
 name=faiserver
@@ -38,12 +51,12 @@ s virt-install --os-variant debian8 --cpu host -n $name --pxe -r 1024 --vcpus 1
 sleep $((60*6)) # takes like 10x as long as a fai install!
 
 opts="-oStrictHostKeyChecking=false -oUserKnownHostsFile=/dev/null"
-while ! scp $opts faiserver-setup root@faiserver:; do
+while ! scp $opts faiserver-setup root@faiserver.b8.nz:; do
     sleep 5
 done
 
 # note: with a vm, pxe boot is turned off in the bios after it's first reboot.
-errcatch-cleanup() { :; }
+err-cleanup() { :; }
 ./pxe-server
 
-ssh $opts root@faiserver ./faiserver-setup
+ssh $opts root@faiserver.b8.nz ./faiserver-setup