Merge tag '5.10.2' into release

faiproject · Apr 26, 2021 · 3f005ab · 3f005ab
2 parents a66b54c + 9e01bd1
commit 3f005ab
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 12 deletions.
diff --git a/bin/fai b/bin/fai
@@ -123,6 +123,11 @@ fai_init() {
             ip -4 addr change "$addr" dev "$iface" valid_lft forever preferred_lft forever
         done
 
+        # enable EFI variables
+        if [ -d /sys/firmware/efi ]; then
+           mount -t efivarfs none /sys/firmware/efi/efivars
+        fi
+
         # tune some nfs parameters
         mount -oremount,ro,noatime /live/image
 
@@ -139,7 +144,7 @@ fai_init() {
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 usage() {
     cat <<-EOF
-        fai $FAI_VERSION. Copyright (C) 1999-2016 Thomas Lange
+        fai $FAI_VERSION. Copyright (C) 1999-2021 Thomas Lange
         Usage: $0 [options] [action]
 
         Options:

diff --git a/conf/NFSROOT b/conf/NFSROOT
@@ -56,7 +56,7 @@ grub-pc
 grub-efi-amd64-bin
 efibootmgr
 linux-image-amd64
-#linux-image-amd64/buster-backports # if you want to use a newer kernel
+#linux-image-amd64/bullseye-backports # if you want to use a newer kernel
 
 PACKAGES install-norec ARM64
 grub-efi-arm64

diff --git a/conf/nfsroot.conf b/conf/nfsroot.conf
@@ -1,7 +1,7 @@
 # For a detailed description see nfsroot.conf(5)
 
 # "<suite> <mirror>" for debootstrap
-FAI_DEBOOTSTRAP="buster http://deb.debian.org/debian"
+FAI_DEBOOTSTRAP="bullseye http://deb.debian.org/debian"
 FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 
 NFSROOT=/srv/fai/nfsroot

diff --git a/conf/sources.list b/conf/sources.list
@@ -1,11 +1,11 @@
 # These lines should work for many sites
 
-deb http://deb.debian.org/debian buster main contrib non-free
-deb http://deb.debian.org/debian-security buster/updates main contrib non-free
-#deb http://deb.debian.org/debian buster-backports main contrib non-free
+deb http://deb.debian.org/debian bullseye main contrib non-free
+deb http://deb.debian.org/debian-security bullseye-security main contrib non-free
+#deb http://deb.debian.org/debian bullseye-backports main contrib non-free
 
 # from bullseye on you need
 #deb http://deb.debian.org/debian-security bullseye-security main contrib non-free
 
-# repository that may contain newer fai packages for buster
-deb http://fai-project.org/download buster koeln
+# repository that may contain newer fai packages for bullseye
+deb http://fai-project.org/download bullseye koeln
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+fai (5.10.2) unstable; urgency=medium
+
+  * make bullseye the default release, Closes: #986884
+  * mount efivarfs when needed, Closes: #986820
+
+ -- Thomas Lange <lange@debian.org>  Wed, 14 Apr 2021 13:58:20 +0200
+
 fai (5.10.1) unstable; urgency=high
 
   [ Andreas Beckmann ]

diff --git a/lib/subroutines b/lib/subroutines
@@ -140,7 +140,7 @@ umount_target() {
 
     if [ "$target" != '/' ]; then
 	# do not umount during softupdate
-	umount $FAI_ROOT/proc $FAI_ROOT/sys $FAI_ROOT/dev/pts $FAI_ROOT/dev 2>/dev/null
+	umount $FAI_ROOT/proc $FAI_ROOT/sys/firmware/efi/efivars $FAI_ROOT/sys $FAI_ROOT/dev/pts $FAI_ROOT/dev 2>/dev/null
 	for dir in $(mount | grep $target | grep -E -v "media/mirror|tmpfs"| awk '{print $3}' | sort -r); do
             mountpoint -q $dir && umount $dir
 	done
@@ -629,7 +629,7 @@ task_faiend() {
 	return 0
     fi
     killall -q sshd systemd-udevd rsyslogd
-    umount $FAI_ROOT/proc $FAI_ROOT/sys $FAI_ROOT/dev/pts 2>/dev/null
+    umount $FAI_ROOT/proc $FAI_ROOT/sys/firmware/efi/efivars $FAI_ROOT/sys $FAI_ROOT/dev/pts 2>/dev/null
     umount -arf 2>/dev/null
 
     echo "Rebooting $HOSTNAME now"

diff --git a/lib/updatebase b/lib/updatebase
@@ -10,6 +10,9 @@ echo "Updating base"
 if [ "$FAI_ACTION" = "install" -o "$FAI_ACTION" = "dirinstall" ]; then
     mount -t proc   proc   $FAI_ROOT/proc
     mount -t sysfs  sysfs  $FAI_ROOT/sys
+    if [ "$FAI_ACTION" = "install" -a  -d /sys/firmware/efi ]; then
+       mount -t efivarfs none $FAI_ROOT/sys/firmware/efi/efivars
+    fi
     if [ -f /etc/init.d/udev ]; then
       mount --bind /dev $FAI_ROOT/dev
       mount --make-private $FAI_ROOT/dev

diff --git a/utils/mkdebmirror b/utils/mkdebmirror
@@ -23,7 +23,7 @@ excl="--exclude=-dbg_ --exclude=debian-installer-netboot-images --include=libc6-
 
 debug="$@"
 arch=amd64
-dist=buster,buster-backports
+dist=bullseye,bullseye-backports
 
 destdir=/files/scratch/debmirror
 sect="--section main,contrib,non-free"
@@ -38,4 +38,4 @@ update_from deb.debian.org --getcontents $*
 
 # even one should not mirror the security site, but I will do it.
 echo "------------------ create mirror for debian-security ------------------"
-debmirror --keyring /usr/share/keyrings/debian-archive-keyring.gpg --method=http $excl $destdir/debian-security $allopt --host=deb.debian.org -r debian-security $sect -d buster/updates $*
+debmirror --keyring /usr/share/keyrings/debian-archive-keyring.gpg --method=http $excl $destdir/debian-security $allopt --host=deb.debian.org -r debian-security $sect -d bullseye-security $*