iankelling.org / git / automated-distro-installer / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f26c5d6)
initial buster support
authorIan Kelling <iank@fsf.org>
Sat, 30 Mar 2019 18:05:43 +0000 (14:05 -0400)
committerIan Kelling <iank@fsf.org>
Sat, 30 Mar 2019 18:05:43 +0000 (14:05 -0400)
fai/config/basefiles/mk-basefile patch | blob | history
fai/config/class/50-host-classes patch | blob | history
fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_FREE [new file with mode: 0644] patch | blob
fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_LINODE [new file with mode: 0644] patch | blob
fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_NONFREE [new file with mode: 0644] patch | blob
faiserver-setup patch | blob | history

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index 89360bd70da421818e48dddaa5db5a5f5b440220..4037d094f09cf211d87f05dd7bae481031cb4317 100755 (executable)
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -28,7 +28,7 @@ EXCLUDE_SQUEEZE=isc-dhcp-client,isc-dhcp-common,info
 EXCLUDE_WHEEZY=info
 EXCLUDE_JESSIE=info
 EXCLUDE_STRETCH=info
-EXCLUDE_BUSTER=
+EXCLUDE_BUSTER=info
 EXCLUDE_SID=
 
 EXCLUDE_BELENOS=dhcp3-client,dhcp3-common,info
diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index ed1d3522a32f2822fd629a8ca650da895215ed65..3767bd3569599476a88835345291ba61c0281886 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -23,20 +23,19 @@
 # Debian stable basefile gets built by faisetup and gets used otherwise.
 # With X suffix, means it has gone through the dirinstall process and has eXtra
 # things installed, to speed up installation.
-# STRETCH64, XENIAL64, BELENOS64, FLIDAS64, FLIDAS64BIG
+# STRETCH64, BUSTER64, XENIAL64, FLIDAS64, FLIDAS64BIG
 #
 # The distro subvol name, we can add as many of these as we want:
-# VOL_TESTING, VOL_STRETCH, VOL_XENIAL, VOL_BELENOS, VOL_FLIDAS, VOL_STRETCH_BOOTSTRAP
-# Using VOL_STRETCH_BOOTSTRAP sets up the install to act like a pxe rom if
-# grub sets a specific var.
+# VOL_TESTING, VOL_STRETCH, VOL_BUSTER, VOL_XENIAL, VOL_FLIDAS,
+# VOL_STRETCH_BOOTSTRAP.  Using VOL_STRETCH_BOOTSTRAP sets up the
+# install to act like a pxe rom if grub sets a specific var.
 #
-# The apt sources files we want,
-# STRETCH_FREE, STRETCH_NONFREE, TESTING_FREE, TESTING_NONFREE,
-# XENIAL_FREE, FLIDAS, BELENOS, STRETCH_LINODE.
+# The apt sources files we want, STRETCH_FREE, STRETCH_NONFREE,
+# BUSTER_FREE, BUSTER_NONFREE, TESTING_FREE, TESTING_NONFREE,
+# XENIAL_FREE, FLIDAS, STRETCH_LINODE.
 #
 # It's all a little redundant in some cases, but it keeps things
-# simpler. Belenos is broken right now, planning to remove it once
-# flidas is released and rms has upgraded.
+# simpler.
 #
 #
 # Other notable classes:
@@ -80,11 +79,11 @@ if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
         # flidas
         _) echo UBUNTU FLIDAS64 VOL_FLIDAS FLIDAS ;;
         # stretch
-        _) echo DEBIAN STRETCH64 VOL_STRETCH STRETCH_NONFREE ;;
+        _) echo DEBIAN STRETCH64 VOL_STRETCH STRETCH_FREE ;;
+        # buster
+        _) echo DEBIAN BUSTER64 VOL_BUSTER BUSTER_FREE ;;
         # testing
-        _) echo DEBIAN STRETCH64 VOL_TESTING TESTING_NONFREE ;;
-        # belenos
-        _) echo UBUNTU BELENOS64 VOL_BELENOS BELENOS ;;
+        _) echo DEBIAN STRETCH64 VOL_TESTING TESTING_FREE ;;
         # xenial
         _) echo UBUNTU XENIAL64 VOL_XENIAL XENIAL_FREE ;;
     esac
diff --git a/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_FREE b/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_FREE
new file mode 100644 (file)
index 0000000..be9c7e3
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_FREE
@@ -0,0 +1,11 @@
+deb http://http.us.debian.org/debian buster main
+deb-src http://http.us.debian.org/debian buster main
+
+deb http://security.debian.org/ buster/updates main
+deb-src http://security.debian.org/ buster/updates main
+
+deb http://http.us.debian.org/debian buster-updates main
+deb-src http://http.us.debian.org/debian buster-updates main
+
+deb http://http.debian.net/debian buster-backports main
+deb-src http://http.debian.net/debian buster-backports main
diff --git a/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_LINODE b/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_LINODE
new file mode 100644 (file)
index 0000000..1d91060
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_LINODE
@@ -0,0 +1,11 @@
+deb http://mirrors.linode.com/debian/ buster main
+deb-src http://mirrors.linode.com/debian/ buster main
+
+deb http://security.debian.org/ buster/updates main
+deb-src http://security.debian.org/ buster/updates main
+
+deb http://mirrors.linode.com/debian/ buster-updates main
+deb-src http://mirrors.linode.com/debian/ buster-updates main
+
+deb http://mirrors.linode.com/debian/ buster-backports main
+deb-src http://mirrors.linode.com/debian/ buster-backports main
diff --git a/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_NONFREE b/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_NONFREE
new file mode 100644 (file)
index 0000000..f85a6fe
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/stretch.list/BUSTER_NONFREE
@@ -0,0 +1,11 @@
+deb http://http.us.debian.org/debian buster main contrib non-free
+deb-src http://http.us.debian.org/debian buster main contrib non-free
+
+deb http://security.debian.org/ buster/updates main contrib non-free
+deb-src http://security.debian.org/ buster/updates main contrib non-free
+
+deb http://http.us.debian.org/debian buster-updates main contrib non-free
+deb-src http://http.us.debian.org/debian buster-updates main contrib non-free
+
+deb http://http.debian.net/debian buster-backports main contrib non-free
+deb-src http://http.debian.net/debian buster-backports main contrib non-free
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
PXE install w multi-boot, btrfs & Libreboot support