various fixes

diff --git a/README b/README
index 0333064685972768f67c0ac5b43c7c8aa7ed209a..07b54a803af60796ebb4ef67e6a316532c3ea54b 100644 (file)
--- a/README
+++ b/README
@@ -70,7 +70,7 @@ All scripts meant to be used directly are listed here:
 
 # Scripts to setup the environment for the install
 
-sudo fai-cd grub.cfg.autodiscover -f -A $BASEFILE_DIR/autodiscover.iso # create autodiscover cd
+sudo fai-cd -g grub.cfg.autodiscover -f -A $BASEFILE_DIR/autodiscover.iso # create autodiscover cd
 mymk-basefile # Create basefiles for various distros
 arch-pxe # Setup arch pxe boot server from an arch base image
 fai-redep # Deploy fai configuration to host "faiserver"

diff --git a/fai-revm b/fai-revm
index 79333773f6bf63a4d6437bc210e8b0e5123ebf6c..a11043056a7856369cb0a63ce04737a5974a961f 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -101,11 +101,11 @@ else
     sleep 2
   else
     fai-monitor&
-    if [[ $BASEFILE_DIR ]]; then
+    if [[ ! $BASEFILE_DIR ]]; then
       BASEFILE_DIR=/tmp
     fi
     if [[ ! -e $BASEFILE_DIR/autodiscover.iso ]]; then
-      fai-cd grub.cfg.autodiscover -f -A $BASEFILE_DIR/autodiscover.iso
+      fai-cd -g grub.cfg.autodiscover -f -A $BASEFILE_DIR/autodiscover.iso
     fi
     boot_arg="--cdrom $BASEFILE_DIR/autodiscover.iso"
     e fai-redep

diff --git a/myfai-chboot b/myfai-chboot
index cbba8b5b97abe269d5e4b41b138e9b31fd1256aa..db19cb63077d4555d6527546f670a614f515ac4a 100755 (executable)
--- a/myfai-chboot
+++ b/myfai-chboot
@@ -33,6 +33,18 @@ 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
+
 
 host=$(./chost faiserver)
 ssh root@$host bash -s -- "$@" <myfai-chboot-local

diff --git a/myfai-chboot-local b/myfai-chboot-local
index f46c32d9308c33a4277402cd6a9e1818848708aa..63a7301090d132f95bbdb475adbdfc1f4a65e9a4 100755 (executable)
--- a/myfai-chboot-local
+++ b/myfai-chboot-local
@@ -104,7 +104,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

diff --git a/pxe-server b/pxe-server
index b1700beab398c08cdc9b1a9b60b99112209b0008..d693642886b6c22d10cdb5d428cb1d777a7d173c 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -41,6 +41,7 @@ TYPE       One of arch, plain, fai.
            after the 2nd. I can't remember exactly why this caused a
            problem, but I'm hoping the sleep will take care of it.
 -S         sets FAI_ACTION=sysinfo, see myfai-chboot for more info.
+-k         Pass -k to myfai-chboot.
 -w         Setup pxe, then wait like -a.
 -h|--help  Print help and exit
 
@@ -64,6 +65,7 @@ dhcp=true
 redep=true
 acks=2
 wait=false
+chboot_args=()
 temp=$(getopt -l help adrSwh "$@") || usage 1
 eval set -- "$temp"
 while true; do
@@ -71,7 +73,8 @@ while true; do
         -a) wait=true; set=false; shift ;;
         -d) dhcp=false; shift ;;
         -r) redep=false; shift ;;
-        -S) chboot_arg=-S; shift ;;
+        -S) chboot_args+=(-S); shift ;;
+        -k) chboot_args+=(-k); shift ;;
         -w) wait=true; set=true; shift ;;
         -h|--help) usage ;;
         --) shift; break ;;
@@ -157,7 +160,7 @@ $([[ $type == arch ]] && echo arch-pxe-mount)"
 if $set; then
     set-pxe
     if [[ $type == fai ]]; then
-        e myfai-chboot $chboot_arg $host
+        e myfai-chboot ${chboot_args[@]} $host
         if $redep; then
             e fai-redep
         fi