more aramo/jammy updates

[automated-distro-installer] / myfai-chboot

diff --git a/myfai-chboot b/myfai-chboot
index 452f8fa579cd3a45de80684a25db60d9b565fb52..308b1c70a04e317cb47e1aeacdefbc831d2c4426 100755 (executable)
--- a/myfai-chboot
+++ b/myfai-chboot
@@ -6,13 +6,13 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 x=$(readlink -f "$BASH_SOURCE"); cd ${x%/*}
 
 usage() {
-    cat <<EOF
-usage: ${0##*/} [-h|--help] [hostname|ip]
+  cat <<EOF
+usage: ${0##*/} [OPTIONS] [HOSTNAME|IP|default]
 
 Sets up tftp pxe config and nfs server on host "faiserver".
 
-If our kernel has no nfs support, uses apache, and depends on another
-repo of Ian Kelling, basic-https-conf, where the file is at
+If our kernel has no nfs support, uses apache intead of nfs, and depends
+on another repo of Ian Kelling, basic-https-conf, where the file is at
 /a/exe/web-conf.
 
 Usng this, you can boot into fai with pxe-kexec without changing
@@ -23,16 +23,24 @@ config for all hosts, but leaves nfs server alone. Use faiserver-disable
 to disable the nfs server.
 
 -S          sets FAI_ACTION=sysinfo, and remove fai flag reboot.
-            Usefull for doing a system recovery.
+            Usefull for doing a system recovery. It reboots automatically anyways :(
+-k          Add serial port output for kgped16
+-i          sets FAI_ACTION=inventory and remove fai flag reboot.
+            I'm not sure what this is usefull for.
 -h|--help   Print help and exit.
 
 EOF
-    exit $1
+  exit $1
 }
 case $1 in
-    -h|--help) usage ;;
+  -h|--help) usage ;;
 esac
 
 
-host=$(chost faiserver)
-ssh root@$host bash -s -- "$@" <myfai-chboot-local
+faiserver_addr=$(host faiserver | sed -rn 's/^\S+ has address //p;T;q' ||:)
+host=$(./chost faiserver)
+if ip a | grep "^ *inet.\? $faiserver_addr" &>/dev/null; then
+  ./myfai-chboot-local "$@"
+else
+  ssh root@$host bash -s -- "$@" <myfai-chboot-local
+fi