X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=myfai-chboot-local;h=1845cd02d58c6c98114f3eaf4987e01cb1e699e3;hb=HEAD;hp=cef41c4347ea32939de34d1146808860417876be;hpb=1e6019a5846160b3f62fc94357e16944b5b3527b;p=automated-distro-installer

diff --git a/myfai-chboot-local b/myfai-chboot-local
index cef41c4..ca4d32e 100755
--- a/myfai-chboot-local
+++ b/myfai-chboot-local
@@ -1,52 +1,87 @@
 #!/bin/bash
-# note, this script gets piped to bash, so cant cd to current dir
+# This file is part of Ian Kelling's automated-distro-installer
+# Copyright (C) 2024 Ian Kelling
+
+# 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.
+
 
-[[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
+[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
+
+set -x
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
+pre="${0##*/}:"
+m() { printf "$pre %s\n"  "$*"; "$@"; }
+e() { printf "$pre %s\n"  "$*"; }
+err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $pre: $*" >&2; }
+
+usage() {
+  cat <<EOF
+Usage: call from myfai-chboot, see its help
+
+# note, this script gets piped to bash, so cant cd to current dir
+
+-h|--help  Print help and exit.
+
+Note: Uses util-linux getopt option parsing: spaces between args and
+options, short options can be combined, options before args.
+EOF
+  exit $1
+}
+
+
 kgped16=false
 bond=false
 fai_action=install
 fai_reboot_arg=,reboot
-while [[ $1 == -* ]]; do
+
+# ensure we can handle args with spaces or empty.
+ret=0; getopt -T || ret=$?
+[[ $ret == 4 ]] || { echo "Install util-linux for enhanced getopt" >&2; exit 1; }
+
+temp=$(getopt -l help,no-r hSi "$@") || usage 1
+eval set -- "$temp"
+while true; do
   case $1 in
-    -h|--help)
-      echo "see help from myfai-chboot"
-      exit 0
-      ;;
     -S)
       fai_action=sysinfo
       fai_reboot_arg=
-      shift
       ;;
     -i) #inventory
       fai_action=inventory
       fai_reboot_arg=
-      shift
       ;;
     -k)
       kgped16=true
-      shift
       ;;
     -b)
       bond=true
-      shift
       ;;
     --no-r)
       fai_reboot_arg=
-      shift
       ;;
+    -h|--help) usage ;;
+    --) shift; break ;;
+    *) echo "$0: unexpected args: $*" >&2 ; usage 1 ;;
   esac
+  shift
 done
-
-pre="${0##*/}:"
-m() { printf "$pre %s\n"  "$*"; "$@"; }
-e() { printf "$pre %s\n"  "$*"; }
-err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $pre: $*" >&2; }
-
-host=$1
+read -r host <<<"$@"
+readonly host
 
 
 rm -f /srv/tftp/fai/pxelinux.cfg/*
@@ -56,22 +91,27 @@ if [[ ! $1 ]]; then
 fi
 
 # somewhat duplicated in brc hostip()
-  case $host in
-    [0-9:])
-      hostip=$host
-      ;;
-    *)
-      hostip=$(getent ahostsv4 "$host" | awk '{ print $1 }' | head -n1)
-      ;;
-  esac
-
-
-# assuming ipv4, or else we might need to deal with multiple addresses
-# in an ipv4 + ipv6 network.
-my_ip=$(ip -4 route get $hostip | sed -nr 's,^.*src\s+(\S+).*,\1,p')
-if [[ ! $my_ip || $my_ip =~ [[:space:]] ]]; then
-  echo "$0: error: failed to get \$my_ip, got: $my_ip"
-  exit 1
+case $host in
+  default) : ;;
+  [0-9:])
+    hostip=$host
+    ;;
+  *)
+    hostip=$(getent ahostsv4 "$host" | awk '{ print $1 }' | head -n1)
+    ;;
+esac
+
+if [[ $hostip ]]; then
+
+  # assuming ipv4, or else we might need to deal with multiple addresses
+  # in an ipv4 + ipv6 network.
+  my_ip=$(ip -4 route get $hostip | sed -nr 's,^.*src\s+(\S+).*,\1,p')
+  if [[ ! $my_ip || $my_ip =~ [[:space:]] ]]; then
+    echo "$0: error: failed to get \$my_ip, got: $my_ip"
+    exit 1
+  fi
+else
+  my_ip=$(ip r show default | sed -r 's/.*via ([^ ]*).*/\1/' | head -n1)
 fi
 
 if [[ $host == default ]]; then
@@ -90,7 +130,7 @@ else
 fi
 
 if modprobe nfsd &>/dev/null; then
-  std_arg="-u nfs://faiserver/srv/fai/config"
+  std_arg="-u nfs://faiserver.b8.nz/srv/fai/config"
   # nfsv4 wont do rw with overlayfs yet
   # https://lists.uni-koeln.de/pipermail/linux-fai/2017-March/011641.html
   root_arg="$my_ip:/srv/fai/nfsroot:vers=3"
@@ -110,9 +150,9 @@ EOF
   fi
   systemctl start nfs-server # assumes recent os
 else
-  std_arg="-u http://faiserver:8080/config.tar.gz"
-  root_arg="live:http://faiserver:8080/squash.img"
-  /a/exe/web-conf -i -p 8080 - apache2 faiserver <<EOF
+  std_arg="-u http://faiserver.b8.nz:8080/config.tar.gz"
+  root_arg="live:http://faiserver.b8.nz:8080/squash.img"
+  /a/exe/web-conf -i -p 8080 - apache2 faiserver.b8.nz <<EOF
 <Location />
     Deny from all
     Allow from $ip
@@ -129,7 +169,7 @@ kernel=$(fai-chboot -L '^default$' | awk '{print $3}')
 default_k_args=$(fai-chboot -L '^default$' | \
                    sed -r "s/^(\S+\s+){3}(.*)/\2/")
 # example of default_k_args
-# initrd=initrd.img-3.16.0-4-amd64 ip=dhcp root=192.168.1.3:/srv/fai/nfsroot FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config FAI_ACTION=install
+# initrd=initrd.img-3.16.0-4-amd64 ip=dhcp root=192.168.1.3:/srv/fai/nfsroot FAI_CONFIG_SRC=nfs://faiserver.b8.nz/srv/fai/config FAI_ACTION=install
 
 # https://wiki.archlinux.org/index.php/Solid_state_drive#Resolving_NCQ_errors
 # currently on needed on d16 samsung 870 qvo, but better to have this