initial buster support

[automated-distro-installer] / faiserver-setup

diff --git a/faiserver-setup b/faiserver-setup
index cf0da93e24d49b00eadba6e267ee7b1cce4c6d18..17dfba3db75bfe8d3799620a3ebf23a4703733ff 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -21,18 +21,18 @@ x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
 
 usage() {
   cat <<EOF
-usage: ${0##*/} [-h|--help]
+usage: ${0##*/} [-h|--help] [BASE_CODENAME]
 install fai-server on the current machine
 
-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.
-Separate from running this, faiserver needs to be setup in dns
-to point to whatever host this is run on.
+Initial setup of a fai server. works on localhost.  Set's the current ip
+as the tftp server. I vaguely remember 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.
 
-It expects $BASEFILE_DIR/STRETCH64.tar.gz to exist, and it
-must have been generated around the same time as the nfsroot,
-at least so it has the same kernel version.
+Default BASE_CODENAME is stretch, and it expects corresponding
+$BASEFILE_DIR/${UPCASED_BASE_CODENAME}64.tar.gz to exist, and it must have been
+generated around the same time as the nfsroot, at least so it has the
+same kernel version.
 
 EOF
   exit $1
@@ -44,14 +44,13 @@ esac
 
 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=stretch
+
+base=${1:-stretch}
+basefile=$BASEFILE_DIR/${base^^}64.tar.gz
 sed="sed -ri --follow-symlinks"
 
-if [[ ! -e $BASEFILE_DIR/STRETCH64.tar.gz ]]; then
-  printf "%s\n" "$0: error BASEFILE_DIR=$BASEFILE_DIR \$BASEFILE_DIR/STRETCH64.tar.gz does not exist"
+if [[ ! -e $basefile ]]; then
+  printf "%s\n" "$0: error BASEFILE_DIR=$BASEFILE_DIR  does not exist"
   exit 1
 fi
 
@@ -97,9 +96,18 @@ elif grep -xFq 'VERSION="9 (stretch)"' /etc/os-release || grep -iE 'flidas|xenai
   # tends to have less bugs.
   gpg --keyserver hkp://pool.sks-keyservers.net -a --recv-keys 2BF8D9FE074BCDE4; gpg -a --export 2BF8D9FE074BCDE4 | apt-key add -
 
-  cat >/etc/apt/sources.list.d/fai.list <<'EOF'
+  case $base in
+    stretch)
+      cat >/etc/apt/sources.list.d/fai.list <<'EOF'
 deb https://fai-project.org/download stretch koeln
 EOF
+      ;;
+    buster)
+      cat >/etc/apt/sources.list.d/fai.list <<'EOF'
+deb https://fai-project.org/download buster koeln
+EOF
+      ;;
+  esac
 else
   rm -f /etc/apt/sources.list.d/fai.list
 fi
@@ -136,7 +144,7 @@ EOF
 
 
 case $base in
-  jessie|stretch)
+  jessie|stretch|buster)
     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.
@@ -159,8 +167,6 @@ EOF
 fi
 
 
-# tried out a stretch base, doesn't work yet.
-#
 $sed -f - /etc/fai/nfsroot.conf <<EOF
 $ a FAI_ROOTPW='$(</q/root/shadow/standard)'
 /^\s*FAI_ROOTPW/d
@@ -193,7 +199,7 @@ fi
 if armhf; then
   cd /srv/fai
   rm -rf nfsroot
-  tar Jxf $BASEFILE_DIR/STRETCH64.tar.xz
+  tar Jxf $basefile
   # background: Can't build the nfsroot on my arm system now.  First,
   # fai-make-nfsroot won't work out of the box. One idea to make it work
   # is by installing qemu-user-static, then copying qemu-x86_64-static
@@ -216,7 +222,7 @@ if armhf; then
     if [ -f $NFSROOT/usr/lib/PXELINUX/pxelinux.0 ]; then
       pxebin=$NFSROOT/usr/lib/PXELINUX/pxelinux.0
     else
-      # jessie/stretch path
+      # jessie+ path
       pxebin=$NFSROOT/usr/lib/syslinux/pxelinux.0
     fi
 
@@ -249,7 +255,7 @@ EOF
 else # not armhf
   # note, this copies the -B arg to
   # /srv/fai/nfsroot/var/tmp/base.tar.xz
-  e fai-setup -evf -B $BASEFILE_DIR/STRETCH64.tar.gz
+  e fai-setup -evf -B $basefile
   # fai-setup expert mode avoids writing to /var/log/fai/variables
   # at least config_src is needed for autodiscover
   $sed '/^FAI_CONFIGDIR|^FAI_CONFIG_SRC|^LOGUSER/d' /var/log/fai/variables