X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=faiserver-setup;fp=faiserver-setup;h=2d76910a53688f577d1c141d218d961e66de5db3;hb=cf3b64c21818d0033ffe5447d30e45141c81ee1b;hp=d8489eda2c0a1e31b8998ce6a9c41f25100ca7fd;hpb=9da78f3b703df721eb9e2c77c6f2e1456c9f4cc1;p=automated-distro-installer

diff --git a/faiserver-setup b/faiserver-setup
index d8489ed..2d76910 100755
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -74,10 +74,10 @@ if grep -xFq 'VERSION="8 (jessie)"' /etc/os-release; then
   cat >/etc/apt/sources.list.d/fai.list <<'EOF'
 deb https://fai-project.org/download jessie koeln
 EOF
-elif grep -iE 'VERSION=.*(stretch|flidas|xenail)' /etc/os-release; then
+elif grep -iE 'VERSION=.*(stretch|flidas|xenail|buster|etiona)' /etc/os-release; then
   # fai on ubuntu only has official support using the universe repo, but newer
   # tends to have less bugs.
-  gpg --keyserver hkp://pool.sks-keyservers.net -a --recv-keys 2BF8D9FE074BCDE4; gpg -a --export 2BF8D9FE074BCDE4 | apt-key add -
+  wget -O - https://fai-project.org/download/2BF8D9FE074BCDE4.asc | apt-key add -
 
   case $base in
     stretch)
@@ -174,13 +174,19 @@ echo "LOGUSER=fai" >>/etc/fai/fai.conf
 # figured out after partitioning ignored my crypt partition
 
 
-if ! grep cryptsetup /etc/fai/NFSROOT &>/dev/null; then
-  cat >>/etc/fai/NFSROOT <<'EOF'
+cedit /etc/fai/NFSROOT <<'EOF' || [[ $? == 1 ]]
 # inserted by faserver-setup
 PACKAGES install
 cryptsetup
+# default one is linux-image-server, doesnt exist anymore
+linux-image-amd64
+# default is btrfs-tools which doesnt exist anymore
+btrfs-progs
+iw
+# got an error in error.log about not having gpg.
+# system seemed to still install ok, so i havent tested if this fixes it.
+gpg
 EOF
-fi
 
 if armhf; then
   cd /srv/fai