merge upstream, untested

[automated-distro-installer] / myfai-chboot-local

diff --git a/myfai-chboot-local b/myfai-chboot-local
index 63a7301090d132f95bbdb475adbdfc1f4a65e9a4..5140f68bb73f349bdf741974b1fbef7e7ba076c5 100755 (executable)
--- a/myfai-chboot-local
+++ b/myfai-chboot-local
@@ -1,27 +1,33 @@
 #!/bin/bash
-
 # note, this script gets piped to bash, so cant cd to current dir
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
+kgped16=false
 fai_action=install
 fai_reboot_arg=,reboot
-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
-    ;;
-esac
+while [[ $1 == -* ]]; 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
+      ;;
+  esac
+done
 
 [[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
 
@@ -37,6 +43,7 @@ host=$1
 
 rm -f /srv/tftp/fai/pxelinux.cfg/*
 if [[ ! $1 ]]; then
+  echo "$0: clearing pxe config and exiting"
   exit 0
 fi