Hi Thomas On 2021-05-12 22:43:52, lange@debian.org wrote: > Hi release team, > > this is a unblock request for fai 5.10.2. > This version is in unstable since 28 days and has following diffs to > the former version 5.10.1. > > There are two changes from 5.10.1 to 5.10.2. > > * make bullseye the default release, Closes: #986884 > * mount efivarfs when needed, Closes: #986820 > > Here are the debdiffs. The changes in files under example/ are > only doc changes because those file are in the package fai-doc. Unblocked, but please file an unblock bug report next time. Requests might otherwise be lost due to the high noise on the mailing list during the freeze. Cheers > > > $ debdiff fai_5.10.1.dsc fai_5.10.2.dsc|diffstat > bin/fai | 7 ++++++- > conf/NFSROOT | 2 +- > conf/nfsroot.conf | 2 +- > conf/sources.list | 10 +++++----- > debian/changelog | 7 +++++++ > examples/simple/class/DEBIAN.var | 2 +- > examples/simple/files/etc/fai/nfsroot.conf/FAISERVER | 2 +- > examples/simple/files/etc/rc.local/FAISERVER | 2 +- > examples/simple/hooks/savelog.LAST.sh | 1 - > lib/subroutines | 4 ++-- > lib/updatebase | 3 +++ > utils/mkdebmirror | 4 ++-- > 12 files changed, 30 insertions(+), 16 deletions(-) > > > > diff -Nru fai-5.10.1/bin/fai fai-5.10.2/bin/fai > --- fai-5.10.1/bin/fai 2021-03-12 17:54:14.000000000 +0100 > +++ fai-5.10.2/bin/fai 2021-04-12 22:07:57.000000000 +0200 > @@ -123,6 +123,11 @@ > 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 @@ > # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > 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 -Nru fai-5.10.1/conf/NFSROOT fai-5.10.2/conf/NFSROOT > --- fai-5.10.1/conf/NFSROOT 2021-03-03 01:57:58.000000000 +0100 > +++ fai-5.10.2/conf/NFSROOT 2021-04-12 22:07:57.000000000 +0200 > @@ -56,7 +56,7 @@ > 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 -Nru fai-5.10.1/conf/nfsroot.conf fai-5.10.2/conf/nfsroot.conf > --- fai-5.10.1/conf/nfsroot.conf 2021-03-03 00:46:13.000000000 +0100 > +++ fai-5.10.2/conf/nfsroot.conf 2021-04-12 22:07:57.000000000 +0200 > @@ -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 -Nru fai-5.10.1/conf/sources.list fai-5.10.2/conf/sources.list > --- fai-5.10.1/conf/sources.list 2021-02-02 14:31:58.000000000 +0100 > +++ fai-5.10.2/conf/sources.list 2021-04-12 22:07:57.000000000 +0200 > @@ -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 -Nru fai-5.10.1/debian/changelog fai-5.10.2/debian/changelog > --- fai-5.10.1/debian/changelog 2021-03-12 21:18:30.000000000 +0100 > +++ fai-5.10.2/debian/changelog 2021-04-14 13:58:20.000000000 +0200 > @@ -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 -Nru fai-5.10.1/examples/simple/class/DEBIAN.var fai-5.10.2/examples/simple/class/DEBIAN.var > --- fai-5.10.1/examples/simple/class/DEBIAN.var 2021-01-31 23:59:33.000000000 +0100 > +++ fai-5.10.2/examples/simple/class/DEBIAN.var 2021-04-12 21:51:09.000000000 +0200 > @@ -1,4 +1,4 @@ > -release=buster > +release=bullseye > apt_cdn=http://deb.debian.org > security_cdn=http://security.debian.org > > diff -Nru fai-5.10.1/examples/simple/files/etc/fai/nfsroot.conf/FAISERVER fai-5.10.2/examples/simple/files/etc/fai/nfsroot.conf/FAISERVER > --- fai-5.10.1/examples/simple/files/etc/fai/nfsroot.conf/FAISERVER 2019-11-08 11:05:15.000000000 +0100 > +++ fai-5.10.2/examples/simple/files/etc/fai/nfsroot.conf/FAISERVER 2021-04-12 21:51:53.000000000 +0200 > @@ -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 -Nru fai-5.10.1/examples/simple/files/etc/rc.local/FAISERVER fai-5.10.2/examples/simple/files/etc/rc.local/FAISERVER > --- fai-5.10.1/examples/simple/files/etc/rc.local/FAISERVER 2021-03-12 17:56:12.000000000 +0100 > +++ fai-5.10.2/examples/simple/files/etc/rc.local/FAISERVER 2021-04-12 21:51:34.000000000 +0200 > @@ -83,7 +83,7 @@ > fai-chboot -o default > > # create a template for booting the installation > -fai-chboot -Iv -f verbose,sshd,createvt,menu -u nfs://faiserver/srv/fai/config buster.tmpl > +fai-chboot -Iv -f verbose,sshd,createvt,menu -u nfs://faiserver/srv/fai/config bullseye.tmpl > > # Since we do not know the MAC address, our DHCP cannot provide the hostname. > # Therefore we do explicitly set the hostname > diff -Nru fai-5.10.1/examples/simple/hooks/savelog.LAST.sh fai-5.10.2/examples/simple/hooks/savelog.LAST.sh > --- fai-5.10.1/examples/simple/hooks/savelog.LAST.sh 2020-06-26 11:43:42.000000000 +0200 > +++ fai-5.10.2/examples/simple/hooks/savelog.LAST.sh 2021-03-13 20:23:50.000000000 +0100 > @@ -13,7 +13,6 @@ > bad > bad > no space > -syntax > Couldn't stat > Cannot access > conflict > diff -Nru fai-5.10.1/lib/subroutines fai-5.10.2/lib/subroutines > --- fai-5.10.1/lib/subroutines 2021-01-31 21:27:18.000000000 +0100 > +++ fai-5.10.2/lib/subroutines 2021-04-12 22:07:57.000000000 +0200 > @@ -140,7 +140,7 @@ > > 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 @@ > 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 -Nru fai-5.10.1/lib/updatebase fai-5.10.2/lib/updatebase > --- fai-5.10.1/lib/updatebase 2019-10-17 03:08:18.000000000 +0200 > +++ fai-5.10.2/lib/updatebase 2021-04-12 22:07:57.000000000 +0200 > @@ -10,6 +10,9 @@ > 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 -Nru fai-5.10.1/utils/mkdebmirror fai-5.10.2/utils/mkdebmirror > --- fai-5.10.1/utils/mkdebmirror 2019-10-17 03:08:18.000000000 +0200 > +++ fai-5.10.2/utils/mkdebmirror 2021-04-12 22:07:57.000000000 +0200 > @@ -23,7 +23,7 @@ > > 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 @@ > > # 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 $* > > -- > best regards Thomas > -- Sebastian Ramacher
Attachment:
signature.asc
Description: PGP signature