small fixes

[automated-distro-installer] / faiserver-setup

diff --git a/faiserver-setup b/faiserver-setup
index 0bf61caf12940d5f559a53de2155bc55b61d2ed5..3e805df9ca2fb5766c210f201fdcf286bfca07fc 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -48,7 +48,7 @@ e() { echo "$@"; "$@"; }
 # the automatic basefile getting will be for stretch
 # instead of jessie, so if you install jessie, you need
 # to setup the basefile and it\'s corresponding class.
-base=jessie
+base=stretch
 sed="sed -ri --follow-symlinks"
 
 if ! type -p wget &>/dev/null; then
@@ -59,12 +59,7 @@ armhf() {
     [[ $(dpkg --print-architecture) == armhf ]]
 }
 
-if grep -xFq 'VERSION="9 (stretch)"' /etc/os-release; then
-  # if we use stretch, no need for fai-project repo.
-  # this will need to be updated when there is a codename
-  # for stretch+1
-  rm -f /etc/apt/sources.list.d/fai.list
-elif armhf; then
+if armhf; then
   if apt-cache policy | grep o=Debian,a=testing,n=stretch &>/dev/null; then
     cat >/etc/apt/sources.list.d/testing.list <<'EOF'
 deb http://http.us.debian.org/debian testing main contrib non-free
@@ -87,11 +82,19 @@ Pin: release a=testing
 Pin-Priority: -10
 EOF
   fi
-else
-    wget -O - http://fai-project.org/download/074BCDE4.asc | apt-key add -
-    cat >/etc/apt/sources.list.d/fai.list <<'EOF'
+elif grep -xFq 'VERSION="8 (jessie)"' /etc/os-release; then
+  gpg -a --recv-keys 2BF8D9FE074BCDE4; gpg -a --export 2BF8D9FE074BCDE4 | apt-key add -
+  cat >/etc/apt/sources.list.d/fai.list <<'EOF'
 deb http://fai-project.org/download jessie koeln
 EOF
+elif grep -xFq 'VERSION="9 (stretch)"' /etc/os-release; then
+  gpg -a --recv-keys 2BF8D9FE074BCDE4; gpg -a --export 2BF8D9FE074BCDE4 | apt-key add -
+
+  cat >/etc/apt/sources.list.d/fai.list <<'EOF'
+deb http://fai-project.org/download stretch koeln
+EOF
+else
+    rm -f /etc/apt/sources.list.d/fai.list
 fi
 
 # for ubuntu:
@@ -126,15 +129,22 @@ deb $r $base main contrib
 deb http://security.debian.org/debian-security $base/updates main contrib
 EOF
 
+
+case $base in
+    jessie|stretch)
+        cat >>/etc/fai/apt/sources.list <<EOF
+# use fai repo. it's commented in the defaults. it's got bug fixes.
+# and may contain newer packages.
+deb http://fai-project.org/download $base koeln
+EOF
+        ;;
+esac
+
 if [[ $base == jessie ]]; then
   cat >>/etc/fai/apt/sources.list <<'EOF'
-# uncommenting this from the defaults. it's got bug fixes.
-# repository that may contain newer fai packages for jessie
-deb http://fai-project.org/download jessie koeln
 # fix tar https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819978
 deb http://ftp.debian.org/debian jessie-backports main
 EOF
-
   # note, fai doesn\'t look at /etc/fai/apt/preferences.d
   cat >/etc/fai/apt/preferences <<'EOF'
 Package: tar
@@ -211,7 +221,7 @@ if armhf; then
   diff -u <(type setup_tftp) <(cat <(sed -n '/^setup_tftp(){/,/^}/p' $(which fai-make-nfsroot) ) - <<'EOF' |bash
 type setup_tftp
 EOF
-)
+                              )
   setup_tftp
 
   # -g causes skipping set_root_pw() in fai-make-nfsroot, -ag