better support for systems with no pxe

[automated-distro-installer] / faiserver-setup

diff --git a/faiserver-setup b/faiserver-setup
index aa83685f2d6fac03a443823131b4cedf0ef6e43e..e43d0192f79eed094432471a95f52da8bb5c5dd5 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -98,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.
@@ -114,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