various fixes for bullseye and new ssh key changes

[automated-distro-installer] / faiserver-setup

diff --git a/faiserver-setup b/faiserver-setup
index cf6b984e1837760d57d815f1c60dc2d7f0a5b306..e1f744bcec9045c1a7c02e9285fadf21371de521 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -155,7 +155,7 @@ EOF
 
 ### begin setup security repo ###
 case $base in
-  stretch|buster|bullseye)
+  stretch|buster)
     cat >>/etc/fai/apt/sources.list <<EOF
 deb http://security.debian.org/debian-security $base/updates main contrib
 EOF
@@ -303,6 +303,14 @@ for ip in faiserver $(ip addr show up| grep -w '^ *inet' | awk '{print $2}'| cut
   echo "$ip $key" >>/srv/fai/nfsroot/root/.ssh/known_hosts
 done
 
+# make it the root because pxe-kexec only looks there.
+# It wouldn't be too hard to change if we needed.
+# We could also just dump things in /srv/tftp, but fai
+# has some defaults, which I don't even use, which expect
+# the other directory, so it's kind of a tossup, whatever.
+sed -ri 's,^ *(TFTP_DIRECTORY=).*,\1"/srv/tftp/fai",' /etc/default/tftpd-hpa
+systemctl restart tftpd-hpa
+
 
 # serial console
 # mainly from