From ab68265ccb7857baff11c0cc216e0c5e9bf4d629 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 25 Nov 2020 00:23:49 -0500 Subject: [PATCH] changes for bullseye --- fai/config/class/50-host-classes | 23 +++++++--- .../distro-install-common/libreboot_grub.cfg | 4 +- .../sources.list.d/bulleye.list/BULLSEYE_FREE | 11 +++++ .../bulleye.list/BULLSEYE_NONFREE | 17 ++++++++ fai/config/hooks/partition.DEFAULT | 14 +++--- faiserver-setup | 43 +++++++++++++------ 6 files changed, 82 insertions(+), 30 deletions(-) create mode 100644 fai/config/files/etc/apt/sources.list.d/bulleye.list/BULLSEYE_FREE create mode 100644 fai/config/files/etc/apt/sources.list.d/bulleye.list/BULLSEYE_NONFREE diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes index 61a5593..076323b 100755 --- a/fai/config/class/50-host-classes +++ b/fai/config/class/50-host-classes @@ -26,15 +26,24 @@ echo FAIBASE STANDARD DEBIAN # 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, BUSTER64, XENIAL64, FLIDAS64, FLIDAS64BIG, ETIONA64, BIONIC64, FOCAL64 # -# The distro subvol name, we can add as many of these as we want: -# VOL_TESTING, VOL_STRETCH, VOL_BUSTER, VOL_XENIAL, VOL_FLIDAS, -# VOL_ETIONA VOL_STRETCH_BOOTSTRAP. Using VOL_STRETCH_BOOTSTRAP sets up -# the install to act like a pxe rom if grub sets a specific var. +# STRETCH64, BUSTER64, BULLSEYE64, +# FLIDAS64, FLIDAS64BIG, ETIONA64, +# XENIAL64, BIONIC64, FOCAL64, # -# The apt sources files we want, STRETCH_FREE, STRETCH_NONFREE, -# BUSTER_FREE, BUSTER_NONFREE, TESTING_FREE, TESTING_NONFREE, +# The distro subvol name, we can add as many of these as we want: +# VOL_TESTING, VOL_STRETCH, VOL_BUSTER, VOL_BULLSEYE, +# VOL_FLIDAS, VOL_ETIONA +# VOL_XENIAL, VOL_BIONIC VOL_FOCAL +# 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, +# BUSTER_FREE, BUSTER_NONFREE, +# BULLSEYE_FREE, BULLSEYE_NONFREE +# TESTING_FREE, TESTING_NONFREE, # XENIAL_FREE, BIONIC, FOCAL, FLIDAS, ETIONA, STRETCH_LINODE. # # It's all a little redundant in some cases, but it keeps things diff --git a/fai/config/distro-install-common/libreboot_grub.cfg b/fai/config/distro-install-common/libreboot_grub.cfg index 4610044..8a1fc4e 100644 --- a/fai/config/distro-install-common/libreboot_grub.cfg +++ b/fai/config/distro-install-common/libreboot_grub.cfg @@ -25,7 +25,7 @@ function save_chosen { # We don't set this to fai check so we can't get into # an infinite reboot cycle. We depend on the os to # create the initial grubenv file. -set default=/debianstretch_bootstrap # could use 0 here. +set default=/debianbuster_bootstrap # could use 0 here. set timeout=1 for part in (ahci*4) (ata*4); do @@ -43,7 +43,7 @@ done did_fai_check=false -bs_dir=/debianstretch_bootstrap +bs_dir=/debianbuster_bootstrap menuentry $bs_dir --id=$bs_dir { # note, we might be able to use $chosen and avoid setting this here, # and set it inside save_chosen. but I haven't tested it, diff --git a/fai/config/files/etc/apt/sources.list.d/bulleye.list/BULLSEYE_FREE b/fai/config/files/etc/apt/sources.list.d/bulleye.list/BULLSEYE_FREE new file mode 100644 index 0000000..04e72ca --- /dev/null +++ b/fai/config/files/etc/apt/sources.list.d/bulleye.list/BULLSEYE_FREE @@ -0,0 +1,11 @@ +deb http://http.us.debian.org/debian bullseye main +deb-src http://http.us.debian.org/debian bullseye main + +deb http://security.debian.org/ bullseye-security main +deb-src http://security.debian.org/ bullseye-security main + +deb http://http.us.debian.org/debian bullseye-updates main +deb-src http://http.us.debian.org/debian bullseye-updates main + +deb http://http.debian.net/debian bullseye-backports main +deb-src http://http.debian.net/debian bullseye-backports main diff --git a/fai/config/files/etc/apt/sources.list.d/bulleye.list/BULLSEYE_NONFREE b/fai/config/files/etc/apt/sources.list.d/bulleye.list/BULLSEYE_NONFREE new file mode 100644 index 0000000..2b5aa98 --- /dev/null +++ b/fai/config/files/etc/apt/sources.list.d/bulleye.list/BULLSEYE_NONFREE @@ -0,0 +1,17 @@ +deb http://http.us.debian.org/debian bullseye main contrib non-free +deb-src http://http.us.debian.org/debian bullseye main contrib non-free + +deb http://security.debian.org/ bullseye-security main contrib non-free +deb-src http://security.debian.org/ bullseye-security main contrib non-free + +deb http://http.us.debian.org/debian bullseye-updates main contrib non-free +deb-src http://http.us.debian.org/debian bullseye-updates main contrib non-free + +deb http://http.debian.net/debian bullseye-backports main contrib non-free +deb-src http://http.debian.net/debian bullseye-backports main contrib non-free + +deb http://http.us.debian.org/debian unstable main contrib non-free +deb-src http://http.us.debian.org/debian unstable main contrib non-free + +deb http://http.us.debian.org/debian experimental main +deb-src http://http.us.debian.org/debian experimental main diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 7c88c74..3d024af 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -305,12 +305,14 @@ esac if [[ ! $DISTRO ]]; then - if ifclass VOL_STRETCH_BOOTSTRAP; then - DISTRO=debianstretch_bootstrap + if ifclass VOL_BUSTER_BOOTSTRAP; then + DISTRO=debianbuster_bootstrap elif ifclass VOL_STRETCH; then DISTRO=debianstretch elif ifclass VOL_BUSTER; then DISTRO=debianbuster + elif ifclass VOL_BULLSEYE; then + DISTRO=debianbullseye elif ifclass VOL_TESTING; then DISTRO=debiantesting elif ifclass VOL_XENIAL; then @@ -319,8 +321,6 @@ if [[ ! $DISTRO ]]; then DISTRO=ubuntubionic elif ifclass VOL_FOCAL; then DISTRO=ubuntufocal - elif ifclass VOL_BELENOS; then - DISTRO=trisquelbelenos elif ifclass VOL_FLIDAS; then DISTRO=trisquelflidas elif ifclass VOL_ETIONA; then @@ -516,7 +516,7 @@ else fi -if $wipe && [[ $DISTRO != debianstretch_bootstrap ]]; then +if $wipe && [[ $DISTRO != debianbuster_bootstrap ]]; then # bootstrap distro doesn't use separate encrypted root. mount -o subvolid=0 $first_root_crypt /mnt # systemd creates subvolumes we want to delete. @@ -553,7 +553,7 @@ btrfs subvolume set-default 0 /mnt # already default, just ensuring it. mkdir -p /mnt/grub2 cp $FAI/distro-install-common/libreboot_grub.cfg /mnt/grub2 -if [[ $DISTRO == debianstretch_bootstrap ]]; then +if [[ $DISTRO == debianbuster_bootstrap ]]; then # this is just convenience for the libreboot_grub config # so we can glob the other ones easier. boot_vol=$DISTRO @@ -576,7 +576,7 @@ grub-editenv /mnt/grubenv set did_fai_check=true grub-editenv /mnt/grubenv set last_boot=/$boot_vol umount /mnt -if [[ $DISTRO == debianstretch_bootstrap ]]; then +if [[ $DISTRO == debianbuster_bootstrap ]]; then cat > /tmp/fai/fstab </etc/apt/sources.list.d/fai.list <<'EOF' deb https://fai-project.org/download jessie koeln EOF -elif grep -iE 'VERSION=.*(stretch|flidas|xenail|buster|etiona)' /etc/os-release; then +elif grep -iE 'VERSION=.*(stretch|flidas|xenail|buster|bullseye|etiona)' /etc/os-release; then # fai on ubuntu only has official support using the universe repo, but newer # tends to have less bugs. wget -O - https://fai-project.org/download/2BF8D9FE074BCDE4.asc | apt-key add - case $base in - stretch) - cat >/etc/apt/sources.list.d/fai.list <<'EOF' -deb https://fai-project.org/download stretch koeln + stretch|buster|bullseye) + cat >/etc/apt/sources.list.d/fai.list </etc/apt/sources.list.d/fai.list <<'EOF' -deb https://fai-project.org/download buster koeln -EOF + *) + echo "$0: error: script needs updating for new base" >&2 + exit 1 ;; esac else @@ -120,21 +127,29 @@ r=http://http.us.debian.org/debian # like default, but scrap httpredir, and nonfree. # All my systems should be able to get along without nonfree # for a base working system afaik. + cat >/etc/fai/apt/sources.list <>/etc/fai/apt/sources.list <>/etc/fai/apt/sources.list <>/etc/fai/apt/sources.list <>/etc/fai/apt/sources.list <<'EOF' -- 2.30.2