X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=faiserver-setup;h=e43d0192f79eed094432471a95f52da8bb5c5dd5;hb=d6df8985152a6c17523cedc3fee62694544eeaf2;hp=724a09c7bce7e4182dd9d01658cb7169e9102f28;hpb=23bf2f3666becf9d3c219af1eaea08b4cf843492;p=automated-distro-installer

diff --git a/faiserver-setup b/faiserver-setup
index 724a09c..e43d019 100755
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -15,10 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+# Usage: faiserver-setup
+#
 # 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
+# that using a hostname does not work.
+# Separate from running this, faiserver needs to be setup in dns
+# to point to whatever host this is run on.
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
@@ -27,7 +30,10 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 e() { echo "$@"; "$@"; }
 
-base=${1:-jessie}
+# tried with stretch at one point, but jessie works for everything,
+# so no point in changing it. Leaving some code to deal with
+# stretch hanging around as it will eventually become stable.
+base=jessie
 sed="sed -ri --follow-symlinks"
 
 
@@ -37,6 +43,7 @@ if [[ $base == jessie ]]; then
 deb http://fai-project.org/download jessie koeln
 EOF
 else
+    # if we use stretch, no need for fai-project repo.
     rm -f /etc/apt/sources.list.d/fai.list
 fi
 
@@ -65,7 +72,6 @@ r=http://http.us.debian.org/debian
 dd of=/etc/fai/apt/sources.list <<EOF
 deb $r $base main contrib non-free
 deb http://security.debian.org/debian-security $base/updates main contrib non-free
-
 EOF
 
 if [[ $base == jessie ]]; then
@@ -92,12 +98,6 @@ e fai-setup -vf
       | tr '\n' ' '; ssh-keyscan localhost | grep -o "ecdsa-sha2-nistp256.*"; \
     } >>/srv/fai/nfsroot/root/.ssh/known_hosts
 
-# this does not alter the config on a new install
-$sed 's#^([[:space:]]*TFTP_DIRECTORY[[:space:]]*=).*#\1"/srv/tftp"#' \
-     /etc/default/tftpd-hpa
-
-service tftpd-hpa restart
-
 # initially did the basic fai-chboot -Iv $std_arg default
 # but found in console that it wanted to mount nfsroot
 # to be the same as my dhcp server.
@@ -108,17 +108,6 @@ service tftpd-hpa restart
 
 # Add debug to -f flag for more verbose output.
 
-std_arg="-u nfs://faiserver/srv/fai/config"
-e 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$' | \
-             sed -r "s/^(\S+\s+){3}(.*root=)(.*)/\2$my_ip:\3/")
-e fai-chboot -k "$k_args" -v -f verbose,sshd,createvt,reboot $std_arg $kernel default
-
 # make the faiserver also the apt proxy server
 apt-get -y install apt-cacher-ng