various fixes

[automated-distro-installer] / faiserver-setup

diff --git a/faiserver-setup b/faiserver-setup
index 54b69f617edcf6ba3966e8ede477c06e56a3b398..3b9ab80f14fef060f1dc20ac94bf48698e127922 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -1,9 +1,12 @@
 #!/bin/bash
 
-# initial setup of a fai server on debian
+# Initial setup of a fai server on debian. works on localhost.
+# Set's the current ip as the tftp server. I vaguely remember
+# that using a hostname does not work
+# Requires changing dns to point faiserver and running fai-redep
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 [[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
 
@@ -25,7 +28,7 @@ to_install=()
 for pkg in $deps; do
     dpkg -s $pkg &>/dev/null && continue ||:
     to_install+=($pkg)
-    echo $pkg >> /etc/fai/fai-manually-installed-packages
+    echo $pkg >>/etc/fai/fai-manually-installed-packages
 done
 if [[ $to_install ]]; then
     apt-get -y install ${to_install[@]}
@@ -63,6 +66,7 @@ std_arg="-u nfs://faiserver/srv/fai/config"
 fai-chboot -Iv $std_arg default # reset so we are idempotent
 kernel=$(fai-chboot -L '^default$' | awk '{print $3}')
 type -t host &>/dev/null || apt-get -y install dnsutils
+# resolve host using gateway address
 my_ip=$(host faiserver $(route -n | sed -rn 's/^(0\.){3}0\s+(\S+).*/\2/p') | \
                sed -rn 's/^\S+ has address //p')
 k_args=$(fai-chboot -L '^default$' | \