X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=myfai-chboot;h=308b1c70a04e317cb47e1aeacdefbc831d2c4426;hp=db19cb63077d4555d6527546f670a614f515ac4a;hb=bfd6bbd3a188aac6871f8b5e1116a0979682d52b;hpb=9288ed79b53a9f276208c59bad353379b5e34914

diff --git a/myfai-chboot b/myfai-chboot
index db19cb6..308b1c7 100755
--- a/myfai-chboot
+++ b/myfai-chboot
@@ -7,7 +7,7 @@ x=$(readlink -f "$BASH_SOURCE"); cd ${x%/*}
 
 usage() {
   cat <<EOF
-usage: ${0##*/} [-h|--help] [HOSTNAME|IP|default]
+usage: ${0##*/} [OPTIONS] [HOSTNAME|IP|default]
 
 Sets up tftp pxe config and nfs server on host "faiserver".
 
@@ -23,7 +23,10 @@ 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
@@ -33,18 +36,11 @@ case $1 in
   -h|--help) usage ;;
 esac
 
-kgped16=false # default
-temp=$(getopt -l help hk "$@") || usage 1
-eval set -- "$temp"
-while true; do
-  case $1 in
-    -k) kgped16=true; shift ;;
-    -h|--help) usage ;;
-    --) shift; break ;;
-    *) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;;
-  esac
-done
-
 
+faiserver_addr=$(host faiserver | sed -rn 's/^\S+ has address //p;T;q' ||:)
 host=$(./chost faiserver)
-ssh root@$host bash -s -- "$@" <myfai-chboot-local
+if ip a | grep "^ *inet.\? $faiserver_addr" &>/dev/null; then
+  ./myfai-chboot-local "$@"
+else
+  ssh root@$host bash -s -- "$@" <myfai-chboot-local
+fi