Hi release team,
this is a unblock request for fai 6.0.1.
This version is in unstable for 25 days.
Attached is the debdiff from 6.0 to 6.0.1
- It fixes a small perl syntax error in install_packages
- It add comments into disk_config/* files which goes into the fai-doc package
- The year in prcopyleft was set to 2023
$ debdiff fai_6.0.dsc fai_6.0.1.dsc|diffstat
bin/install_packages | 2 +-
debian/changelog | 12 ++++++++++++
examples/simple/disk_config/FAIBASE | 3 +++
examples/simple/disk_config/FAIBASE_EFI | 3 +++
examples/simple/disk_config/ROCKY | 3 +++
examples/simple/scripts/GRUB_EFI/10-setup | 5 +++++
lib/prcopyleft | 4 ++--
7 files changed, 29 insertions(+), 3 deletions(-)
diff -Nru fai-6.0/bin/install_packages fai-6.0.1/bin/install_packages
--- fai-6.0/bin/install_packages 2022-11-13 18:48:57.000000000 +0100
+++ fai-6.0.1/bin/install_packages 2023-02-23 16:31:07.000000000 +0100
@@ -204,7 +204,7 @@
my $packlist = join(' ',@{$pkglist});
if ($atype eq "hold") {
- my $hold = join " hold\n", @{$list{hold}}, "";
+ my $hold = join " hold\n", @{$list{hold}{$pkgopt}}, "";
execute("echo \"$hold\" | $rootcmd $command{hold}");
next;
}
diff -Nru fai-6.0/debian/changelog fai-6.0.1/debian/changelog
--- fai-6.0/debian/changelog 2023-01-13 22:45:03.000000000 +0100
+++ fai-6.0.1/debian/changelog 2023-03-08 19:38:00.000000000 +0100
@@ -1,3 +1,15 @@
+fai (6.0.1) unstable; urgency=low
+
+ [ Joerg Behrmann ]
+ * install_packages: fix wrong type of perl variable, Closes: #1032267
+
+ [ Thomas Lange ]
+ * prtcopyleft: year++
+ * disk_config/*: add comment about mkfs option that is needed when using
+ older Debian releases, Closes: #1031415
+
+ -- Thomas Lange <[email protected]> Wed, 08 Mar 2023 19:38:00 +0100
+
fai (6.0) unstable; urgency=low
[ Thomas Lange ]
diff -Nru fai-6.0/examples/simple/disk_config/FAIBASE
fai-6.0.1/examples/simple/disk_config/FAIBASE
--- fai-6.0/examples/simple/disk_config/FAIBASE 2019-03-26 16:32:51.000000000
+0100
+++ fai-6.0.1/examples/simple/disk_config/FAIBASE 2023-02-21
22:06:49.000000000 +0100
@@ -2,6 +2,9 @@
#
# <type> <mountpoint> <size> <fs type> <mount options> <misc options>
+# you may want to add "-O ^metadata_csum_seed" to createopts if the target
+# system is older than bullseye. See #866603, #1031415, #1031416 for more info.
+
disk_config disk1 disklabel:msdos bootable:1 fstabkey:uuid
primary / 2G-50G ext4 rw,noatime,errors=remount-ro
diff -Nru fai-6.0/examples/simple/disk_config/FAIBASE_EFI
fai-6.0.1/examples/simple/disk_config/FAIBASE_EFI
--- fai-6.0/examples/simple/disk_config/FAIBASE_EFI 2022-11-09
10:41:39.000000000 +0100
+++ fai-6.0.1/examples/simple/disk_config/FAIBASE_EFI 2023-02-21
22:07:05.000000000 +0100
@@ -2,6 +2,9 @@
#
# p=<partlabel> <mountpoint> <size> <fs type> <mount options> <misc options>
+# you may want to add "-O ^metadata_csum_seed" to createopts if the target
+# system is older than bullseye. See #866603, #1031415, #1031416 for more info.
+
disk_config disk1 disklabel:gpt bootable:1 fstabkey:uuid
p=efi /boot/efi 512M vfat rw
diff -Nru fai-6.0/examples/simple/disk_config/ROCKY
fai-6.0.1/examples/simple/disk_config/ROCKY
--- fai-6.0/examples/simple/disk_config/ROCKY 2022-05-28 18:25:13.000000000
+0200
+++ fai-6.0.1/examples/simple/disk_config/ROCKY 2023-02-21 22:08:38.000000000
+0100
@@ -2,6 +2,9 @@
#
# <type> <mountpoint> <size> <fs type> <mount options> <misc options>
+# you may want to add "-O ^metadata_csum_seed" to createopts if the target
+# system is older than bullseye. See #866603, #1031415, #1031416 for more info.
+
disk_config disk1 disklabel:msdos bootable:1 fstabkey:label
primary / 4G-50G ext4 rw,noatime,errors=remount-ro createopts="-L
ROOT"
diff -Nru fai-6.0/examples/simple/scripts/GRUB_EFI/10-setup
fai-6.0.1/examples/simple/scripts/GRUB_EFI/10-setup
--- fai-6.0/examples/simple/scripts/GRUB_EFI/10-setup 2022-11-27
20:21:24.000000000 +0100
+++ fai-6.0.1/examples/simple/scripts/GRUB_EFI/10-setup 2023-01-17
12:15:57.000000000 +0100
@@ -69,5 +69,10 @@
fi
fi
$ROOTCMD update-grub
+if [[ $BOOT_DEVICE =~ '/dev/loop' ]]; then
+ :
+else
+ efibootmgr -v
+fi
exit $error
diff -Nru fai-6.0/lib/prcopyleft fai-6.0.1/lib/prcopyleft
--- fai-6.0/lib/prcopyleft 2022-05-26 21:45:20.000000000 +0200
+++ fai-6.0.1/lib/prcopyleft 2023-01-14 14:03:09.000000000 +0100
@@ -3,7 +3,7 @@
#*********************************************************************
#
# This script is part of FAI (Fully Automatic Installation)
-# (c) 2003-2022 by Thomas Lange, [email protected]
+# (c) 2003-2023 by Thomas Lange, [email protected]
# Universitaet zu Koeln
#
#*********************************************************************
@@ -17,7 +17,7 @@
-------------------------------------------------
Fully Automatic Installation - FAI
- $FAI_VERSION (c) 1999-2022
+ $FAI_VERSION (c) 1999-2023
Thomas Lange <[email protected]>
-------------------------------------------------
EOF
--
best regards Thomas
