X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=myfai-chboot-local;h=3ecc7d13f83d5b3beb8af69327faca4c875f56ad;hb=ee37d990c89bb3bab1b54e3b3fb43e9f79ed039b;hp=49ee6f6efcb6c9ce9ad67d7f30fee83fab3f35c7;hpb=c47175685b348735b3440e16851dde2cc39b6f3f;p=automated-distro-installer

diff --git a/myfai-chboot-local b/myfai-chboot-local
index 49ee6f6..3ecc7d1 100755
--- a/myfai-chboot-local
+++ b/myfai-chboot-local
@@ -1,29 +1,36 @@
 #!/bin/bash
-
 # note, this script gets piped to bash, so cant cd to current dir
+
+[[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
+
 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
-
-[[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
+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
 
 e() {
   echo "$*"
@@ -35,6 +42,12 @@ e() {
 
 host=$1
 
+rm -f /srv/tftp/fai/pxelinux.cfg/*
+if [[ ! $1 ]]; then
+  echo "$0: clearing pxe config and exiting"
+  exit 0
+fi
+
 # assuming ipv4, or else we might need to deal with multiple addresses
 # in an ipv4 + ipv6 network.
 my_ip=$(ip -4 route get 8.8.8.8 | sed -nr 's,^.*src\s+(\S+).*,\1,p')
@@ -71,7 +84,7 @@ if modprobe nfsd &>/dev/null; then
   if [[ -w /etc/exports ]]; then
     sed -ri --follow-symlinks '\%^/srv/fai/%d' /etc/exports
     cat >>/etc/exports <<EOF
-/srv/fai/config $ip(async,ro,no_subtree_check)
+/srv/fai/config $ip(async,ro,no_subtree_check,no_root_squash)
 /srv/fai/nfsroot $ip(async,ro,no_subtree_check,no_root_squash)
 EOF
     exportfs -ra
@@ -88,10 +101,6 @@ else
 EOF
 fi
 
-rm -f /srv/tftp/fai/pxelinux.cfg/*
-if [[ ! $1 ]]; then
-  exit 0
-fi
 
 
 # man page doesn't explain this, but this deletes & thus disables
@@ -103,7 +112,11 @@ default_k_args=$(fai-chboot -L '^default$' | \
 # example of default_k_args
 # initrd=initrd.img-3.16.0-4-amd64 ip=dhcp root=192.168.1.3:/srv/fai/nfsroot aufs FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config FAI_ACTION=install
 
-k_args=(console=tty0 console=ttyS0,115200 FAI_ACTION=$fai_action)
+k_args=(FAI_ACTION=$fai_action)
+if $kgped16; then
+  k_args+=(console=tty0 console=ttyS0,115200)
+fi
+
 for arg in $default_k_args; do
   case $arg in
     # default root arg is /srv/fai/nfsroot