update to bullseye

diff --git a/README b/README
index a1cb54db8ce6ac136c9d4c19baf3b1dcda03d491..aeb39571f561569a37deecf6544df13f79e56395 100644 (file)
--- a/README
+++ b/README
@@ -140,9 +140,6 @@ fresize # resize swap or boot partitions in a host
 
 # Replacing a raid 10 disk
 
-# i expect better results with newer kernel and btrfs progs than the default stretch
-fai-server buster
-
 pxe-server -S HOST fai
 
 # btrfs replace or delete. prefer replace. to setup partitions on replacement drive:

diff --git a/fai-revm b/fai-revm
index 0d117e6d98e1c0a774decd27826fa25eeb6c20c1..5aa1e6c0cfac53fa354b461261cd5680f8a23dde 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -122,7 +122,7 @@ else
       BASEFILE_DIR=/tmp
     fi
     isopath=$BASEFILE_DIR/$iso
-    isosrc=$BASEFILE_DIR/BUSTER64.tar.gz
+    isosrc=$BASEFILE_DIR/BULLSEYE64.tar.gz
     if [[ ! -e $isopath || $(stat -c %Y $isopath) -lt $(stat -c %Y $isosrc) ]]; then
       e sudo fai-cd -g $(readlink -f grub.cfg.${iso%%.*}) -f -A $isopath
     fi

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index f6b7caa4b82e46fc30453dc4cc31392f037ed280..c62229f50a9a062f90512cabad166db9773b674a 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -27,12 +27,12 @@ echo FAIBASE STANDARD DEBIAN
 # With X suffix, means it has gone through the dirinstall process and has eXtra
 # things installed, to speed up installation.
 #
-# STRETCH64, BUSTER64, BULLSEYE64,
+# STRETCH64, BUSTER64, BULLSEYE64, BOOKWORM64
 # FLIDAS64, FLIDAS64BIG, ETIONA64, NABIA64
 # XENIAL64, BIONIC64, FOCAL64,
 #
 # The distro subvol name, we can add as many of these as we want:
-# VOL_TESTING, VOL_STRETCH, VOL_BUSTER, VOL_BULLSEYE,
+# VOL_TESTING, VOL_STRETCH, VOL_BUSTER, VOL_BULLSEYE, VOL_BOOKWORM
 # VOL_FLIDAS, VOL_ETIONA, VOL_NABIA
 # VOL_XENIAL, VOL_BIONIC VOL_FOCAL
 # VOL_BUSTER_BOOTSTRAP.
@@ -43,6 +43,7 @@ echo FAIBASE STANDARD DEBIAN
 # STRETCH_FREE, STRETCH_NONFREE,
 # BUSTER_FREE, BUSTER_NONFREE,
 # BULLSEYE_FREE, BULLSEYE_NONFREE
+# BOOKWORM_FREE, BOOKWORM_NONFREE
 # TESTING_FREE, TESTING_NONFREE,
 # XENIAL_FREE, BIONIC, FOCAL, FLIDAS, ETIONA, NABIA, STRETCH_LINODE.
 #
@@ -86,7 +87,11 @@ echo FAIBASE STANDARD DEBIAN
 #!/bin/bash
 if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
   case $HOSTNAME in
-    # buster based minimal recovery / bootstraping os:
+    # bookworm
+    _) echo BOOKWORM64 VOL_BOOKWORM_BOOTSTRAP BOOKWORM_FREE ;;
+    # bullseye based minimal recovery / bootstraping os:
+    _) echo BULLSEYE64 VOL_BULLSEYE_BOOTSTRAP BULLSEYE_FREE ;;
+    # buster
     _) echo BUSTER64 VOL_BUSTER_BOOTSTRAP BUSTER_FREE ;;
     # flidas
     _) echo UBUNTU FLIDAS64 VOL_FLIDAS FLIDAS ;;

diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end
index b0e070048e4df3ce7b6a44085a19bb23e88d0e5a..0204ce50025bd3312267c7bed58c2382c17413a2 100755 (executable)
--- a/fai/config/distro-install-common/end
+++ b/fai/config/distro-install-common/end
@@ -50,7 +50,7 @@ au() { # add user. i don't use adduser for portability
 chpw root "$ROOTPW"
 
 # only setup root pass for bootstrap vol
-if ifclass VOL_BUSTER_BOOTSTRAP; then
+if ifclass VOL_BULLSEYE_BOOTSTRAP; then
   exit 0
 fi
 

diff --git a/fai/config/distro-install-common/libreboot_grub.cfg b/fai/config/distro-install-common/libreboot_grub.cfg
index 54cf46837a1a109545e8d9d3c183159d2ee89958..7af4219a4e7ee357e93ab8e6874ce4352f29110f 100644 (file)
--- a/fai/config/distro-install-common/libreboot_grub.cfg
+++ b/fai/config/distro-install-common/libreboot_grub.cfg
@@ -14,7 +14,7 @@ function save_chosen {
 }
 
 # fai_check is so we can act like a pxe boot, but just for fai, and by
-# using /buster_bootstrap to do it.  We toggle on and off the grub var
+# using /bullseye_bootstrap to do it.  We toggle on and off the grub var
 # did_fai_check so we can do the check every other boot. Then
 # /debian_bootstrap checks for that var on boot and if we want to do a
 # fai check, it does it, then reboots. But fai-check also sets
@@ -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=/debianbuster_bootstrap # could use 0 here.
+set default=/debianbullseye_bootstrap # could use 0 here.
 set timeout=1
 
 # grub_extn
@@ -44,7 +44,7 @@ done
 
 did_fai_check=false
 
-bs_dir=/debianbuster_bootstrap
+bs_dir=/debianbullseye_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/bullseye.list/BULLSEYE_FREE
similarity index 50%
rename from fai/config/files/etc/apt/sources.list.d/bulleye.list/BULLSEYE_FREE
rename to fai/config/files/etc/apt/sources.list.d/bullseye.list/BULLSEYE_FREE
index 04e72ca6da6329408779d8fbda33558fcc65da02..c830a4d9108c2818de7fe16a61809d5ae8430535 100644 (file)
--- a/fai/config/files/etc/apt/sources.list.d/bulleye.list/BULLSEYE_FREE
+++ b/fai/config/files/etc/apt/sources.list.d/bullseye.list/BULLSEYE_FREE
@@ -1,11 +1,11 @@
-deb http://http.us.debian.org/debian bullseye main
-deb-src http://http.us.debian.org/debian bullseye main
+deb http://deb.debian.org/debian bullseye main
+deb-src http://deb.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://deb.debian.org/debian bullseye-updates main
+deb-src http://deb.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/bullseye.list/BULLSEYE_NONFREE
similarity index 100%
rename from fai/config/files/etc/apt/sources.list.d/bulleye.list/BULLSEYE_NONFREE
rename to fai/config/files/etc/apt/sources.list.d/bullseye.list/BULLSEYE_NONFREE

diff --git a/fai/config/files/root/fai-check/VOL_BUSTER_BOOTSTRAP b/fai/config/files/root/fai-check/VOL_BULLSEYE_BOOTSTRAP
similarity index 94%
rename from fai/config/files/root/fai-check/VOL_BUSTER_BOOTSTRAP
rename to fai/config/files/root/fai-check/VOL_BULLSEYE_BOOTSTRAP
index 900c719183cab428f5461e389661f9ea56a5b6a4..330efcc85c8cc4a812fd5859dfb3149a75155266 100755 (executable)
--- a/fai/config/files/root/fai-check/VOL_BUSTER_BOOTSTRAP
+++ b/fai/config/files/root/fai-check/VOL_BULLSEYE_BOOTSTRAP
@@ -70,7 +70,7 @@ for dev in $(btrfs fi show / | sed -rn 's#^\s*devid\s.*\s([^0-9 ]+)\S+$#\1#p' \
       set +x
     fi
     first=false
-    # we could just as well check if last_boot != /debianbuster_boostrap
+    # we could just as well check if last_boot != /debianbullseye_bootstrap
     # the intent with this one is just a little clearer.
     if [[ $did_fai_check == true ]]; then
       grub-editenv /mnt/grubenv set did_fai_check=os_true
@@ -92,7 +92,7 @@ for dev in $(btrfs fi show / | sed -rn 's#^\s*devid\s.*\s([^0-9 ]+)\S+$#\1#p' \
 done
 
 # the check for last_boot is not needed afaik, just sanity check.
-if [[ $did_fai_check == true && $last_boot != /debianbuster_boostrap ]]; then
+if [[ $did_fai_check == true && $last_boot != /debianbullseye_bootstrap ]]; then
   # no need to reboot if we actually want to boot into this os.
   reboot
 fi

diff --git a/fai/config/hooks/instsoft.DEFAULT b/fai/config/hooks/instsoft.DEFAULT
index 07adc1dfa62b907935dfce6c26484ffc7cec525a..2d0c9058c9b8c2b52f5751e8e9c5159ecc08e1e5 100755 (executable)
--- a/fai/config/hooks/instsoft.DEFAULT
+++ b/fai/config/hooks/instsoft.DEFAULT
@@ -3,7 +3,7 @@
 # These are things we can do before package_config packages get installed.
 
 # exit for any vm except demohost, or if we are doing a dirinstall
-if ifclass VM && ! ifclass demohost || ifclass VOL_BUSTER_BOOTSTRAP || [[ ! $FAI_ACTION || $FAI_ACTION = dirinstall ]]; then
+if ifclass VM && ! ifclass demohost || ifclass VOL_BULLSEYE_BOOTSTRAP || [[ ! $FAI_ACTION || $FAI_ACTION = dirinstall ]]; then
   exit 0
 fi
 

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index afbca5a6d30a825ebf88baabc650e01ec5bb1c26..56919e91a292cdb0a4867dfc625e761056fab085 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -386,8 +386,8 @@ esac
 
 
 if [[ ! $DISTRO ]]; then
-  if ifclass VOL_BUSTER_BOOTSTRAP; then
-    DISTRO=debianbuster_bootstrap
+  if ifclass VOL_BULLSEYE_BOOTSTRAP; then
+    DISTRO=debianbullseye_bootstrap
   elif ifclass VOL_STRETCH; then
     DISTRO=debianstretch
   elif ifclass VOL_BUSTER; then
@@ -671,7 +671,7 @@ else
 fi
 
 
-if $wipe && [[ $DISTRO != debianbuster_bootstrap ]]; then
+if $wipe && [[ $DISTRO != debianbullseye_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.
@@ -711,7 +711,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 == debianbuster_bootstrap ]]; then
+if [[ $DISTRO == debianbullseye_bootstrap ]]; then
   # this is just convenience for the libreboot_grub config
   # so we can glob the other ones easier.
   boot_vol=$DISTRO
@@ -735,7 +735,7 @@ grub-editenv /mnt/grubenv set last_boot=/$boot_vol
 umount /mnt
 
 fstabstd=x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s
-if [[ $DISTRO == debianbuster_bootstrap ]]; then
+if [[ $DISTRO == debianbullseye_bootstrap ]]; then
   cat > /tmp/fai/fstab <<EOF
 $first_boot_dev  /  btrfs  noatime,subvol=$boot_vol  0 0
 $first_efi  /boot/efi  vfat          nofail,$fstabstd  0 0

diff --git a/fai/config/package_config/DEBIAN b/fai/config/package_config/DEBIAN
index c1cb0bf77d09275dce20d6c8bed9643ef031a066..0ceedded7e74fe72d829c62edeb814cb12e666f4 100644 (file)
--- a/fai/config/package_config/DEBIAN
+++ b/fai/config/package_config/DEBIAN
@@ -1,5 +1,6 @@
-# otherwise sshd takes like 10 seconds to start
-PACKAGES install BUSTER
+# otherwise sshd takes like 10 seconds to start.
+# not sure if this applies to bullseye or just buster, installing it so i dun have to worry.
+PACKAGES install BUSTER BULLSEYE
 haveged
 
 PACKAGES install NONFREE

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index 8143d4e5718b1acc9a479215c34d1a7a07e9b76b..4ef74c38278b2e02c4aba688b242b1490af30cf0 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -309,7 +309,7 @@ EOF
 ##### end network setup  #####
 
 
-if ifclass VOL_BUSTER_BOOTSTRAP; then
+if ifclass VOL_BULLSEYE_BOOTSTRAP; then
   fcopy /etc/systemd/system/faicheck.service
   chroot $FAI_ROOT bash <<'EOFOUTER'
 systemctl enable faicheck.service

diff --git a/faiserver-setup b/faiserver-setup
index 42ecb3b30c29602ef10f42a33b5b2112f1fbcc7f..cf6b984e1837760d57d815f1c60dc2d7f0a5b306 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -31,7 +31,7 @@ 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.
 
-Default BASE_CODENAME is buster. Default ARCH is 64. The script expects corresponding
+Default BASE_CODENAME is bullseye. Default ARCH is 64. The script expects corresponding
 $BASEFILE_DIR/${UPCASED_BASE_CODENAME}${ARCH}.tar.(gz|xz) to exist, and it must have been
 generated around the same time as the nfsroot, at least so it has the
 same kernel version.
@@ -61,7 +61,7 @@ esac
 e() { echo "+ $@"; "$@"; }
 
 
-base=${1:-buster}
+base=${1:-bullseye}
 arch=${2:-64}
 
 if [[ $base == [[:upper:]] ]]; then
@@ -97,7 +97,7 @@ wget -O - https://fai-project.org/download/2BF8D9FE074BCDE4.asc | apt-key add -
 
 update=false
 case $base in
-  stretch|buster|bullseye)
+  stretch|bullseye|bullseye)
     if ! grep -qFx "deb https://fai-project.org/download $base koeln" /etc/apt/sources.list.d/fai.list; then
       update=true
     fi
@@ -155,7 +155,7 @@ EOF
 
 ### begin setup security repo ###
 case $base in
-  stretch|buster)
+  stretch|buster|bullseye)
     cat >>/etc/fai/apt/sources.list <<EOF
 deb http://security.debian.org/debian-security $base/updates main contrib
 EOF

diff --git a/mymk-basefile b/mymk-basefile
index a784e00d10ca17f8dbd4237bce33686931c5d17f..b572ccdf27268f1c38e9ce8186a139d60c7362e4 100755 (executable)
--- a/mymk-basefile
+++ b/mymk-basefile
@@ -16,6 +16,7 @@ them often. Better to build our all our own.
 
 Args I've used before:
 
+-z BULLSEYE64
 -z BUSTER64
 -z STRETCH64
 -z XENIAL64