Bug#771107: unblock: fai/4.3.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package fai 4.3.1. Debdiff included.
It fixes three important bugs:
#769097 fai-quickstart: unowned files after purge (policy 6.8, 10.8): /var/lib/nfs/{.[ex]tab., export-}lock
#769683 fai-server: fai-cd fails if /usr/bin/strings (pkg binutils) is not installed
#769923 fai-setup-storage: flag_initial is not respected any more
Here's the annotated diff of the new FAI version:
I used this command to produce the diffs:
debdiff fai_4.3.dsc fai_4.3.1.dsc | filterdiff -x '*/man/*' -x '*/doc/*' -x '*/examples/simple/*'
I've excluded the man pages, the documentation and the subdirectory
examples/simple, because everything in this subdir will got into the
package fai-doc.
For each file I've added some NOTE: lines in front of the diff.
NOTE: This diff fixes part of #769683, this bug is important
--- fai-4.3/bin/fai-cd 2014-06-29 22:27:39.000000000 +0200
+++ fai-4.3.1/bin/fai-cd 2014-11-16 15:09:02.000000000 +0100
@@ -302,6 +302,8 @@
[ -x "$(which xorriso)" ] || die 8 "xorriso not found. Please install package."
fi
+[ -x "$(which strings)" ] || die 8 "command strings not found. Please install package binutils."
+
# use FAI_ETC_DIR from environment variable
if [ -n "$FAI_ETC_DIR" -a -z "$cdir" ]; then
echo "Using environment variable \$FAI_ETC_DIR."
NOTE: fix typo in package name
--- fai-4.3/conf/NFSROOT 2014-10-07 14:47:34.000000000 +0200
+++ fai-4.3.1/conf/NFSROOT 2014-11-12 11:34:06.000000000 +0100
@@ -19,7 +19,7 @@
#firmware-linux-nonfree
# dracut can replace live-boot
-dracut-network live-boot- live-boot-initramfs-tools-
+dracut-network live-boot- initramfs-tools-
# choose if you like live-boot or dracut inside the nfsroot
#live-boot live-boot-doc
NOTE: the new changelog entry for 4.3.1
--- fai-4.3/debian/changelog 2014-10-24 14:34:46.000000000 +0200
+++ fai-4.3.1/debian/changelog 2014-11-19 16:06:11.000000000 +0100
@@ -1,3 +1,23 @@
+fai (4.3.1) unstable; urgency=low
+
+ [Thomas Lange]
+ * Init.pm: fix code which uses value of $ENV{flag_initial}, Closes: #769923
+ * fai-quickstart.postrm: add new script, Closes: #769097
+ * fai-cd: add test if command strings is available, Closes: #769683
+ * control: add binutils to suggests for fai-server and to depends for
+ fai-quickstart, Closes: #769683
+ * control: use newer package name ntfs-3g instead of ntfsprogs
+ * conf/NFSROOT: fix typo in package name
+ * fai-kvm: remove deprecated option from kvm call
+ * 40-install-grub: fix code, so the exit code is not always != 0
+ * disk_config: remove separate /usr and /var, make / bigger
+
+ [Moritz 'Morty' Strübe]
+ * control: fix lintian warning debhelper-but-no-misc-depends
+ * fai-guide.txt: correct information about apt/.asc files
+
+ -- Thomas Lange <lange@debian.org> Wed, 19 Nov 2014 16:06:10 +0100
+
fai (4.3) unstable; urgency=low
[Kerim Güney]
NOTE: three changes are included in control:
NOTE: - add binutils to suggests for fai-server and to depends for fai-quickstart, Closes: #769683
NOTE: - use newer package name ntfs-3g instead of ntfsprogs
NOTE: - fix lintian warning debhelper-but-no-misc-depends
--- fai-4.3/debian/control 2014-10-07 14:46:27.000000000 +0200
+++ fai-4.3.1/debian/control 2014-11-16 15:11:38.000000000 +0100
@@ -12,7 +12,7 @@
Package: fai-client
Architecture: all
-Depends: perl, file, libapt-pkg-perl, iproute2 | iproute, debconf-utils
+Depends: perl, file, libapt-pkg-perl, iproute2 | iproute, debconf-utils, ${misc:Depends}
Recommends: libgraph-perl
Suggests: logtail
Description: Fully Automatic Installation client package
@@ -27,6 +27,7 @@
Package: fai-doc
Architecture: all
+Depends: ${misc:Depends}
Section: doc
Description: Documentation for FAI
FAI is a non-interactive system to install, customize and manage
@@ -38,9 +39,9 @@
Package: fai-server
Architecture: all
-Depends: fai-client, debootstrap
+Depends: fai-client, debootstrap, ${misc:Depends}
Recommends: nfs-kernel-server, isc-dhcp-server, tftpd-hpa | atftpd, openssh-server, openssh-client, openbsd-inetd | inet-superserver, libproc-daemon-perl
-Suggests: debmirror, reprepro, xorriso, grub, aptitude, perl-tk
+Suggests: debmirror, reprepro, xorriso, binutils, grub, aptitude, perl-tk
Description: Fully Automatic Installation server package
FAI is a non-interactive system to install, customize and manage
Linux systems and software configurations on computers as well as
@@ -58,7 +59,7 @@
Package: fai-quickstart
Architecture: all
-Depends: fai-server, fai-doc, isc-dhcp-server, nfs-kernel-server, tftpd-hpa | atftpd, reprepro, xorriso, openbsd-inetd | inet-superserver
+Depends: fai-server, fai-doc, isc-dhcp-server, nfs-kernel-server, tftpd-hpa | atftpd, reprepro, xorriso, binutils, openbsd-inetd | inet-superserver, ${misc:Depends}
Description: Fully Automatic Installation quickstart package
FAI is a non-interactive system to install, customize and manage
Linux systems and software configurations on computers as well as
@@ -69,7 +70,7 @@
Package: fai-nfsroot
Architecture: all
-Depends: fai-client, fai-setup-storage, pxelinux| syslinux-common
+Depends: fai-client, fai-setup-storage, pxelinux| syslinux-common, ${misc:Depends}
Description: Fully Automatic Installation nfsroot package
FAI is a non-interactive system to install, customize and manage
Linux systems and software configurations on computers as well as
@@ -81,9 +82,9 @@
Package: fai-setup-storage
Architecture: all
-Depends: perl, libparse-recdescent-perl, liblinux-lvm-perl, parted
+Depends: perl, libparse-recdescent-perl, liblinux-lvm-perl, parted, ${misc:Depends}
Recommends: lvm2, mdadm
-Suggests: dmsetup, cryptsetup, dosfstools, jfsutils, ntfsprogs, reiserfsprogs, xfsprogs
+Suggests: dmsetup, cryptsetup, dosfstools, jfsutils, ntfs-3g, reiserfsprogs, xfsprogs
Description: automatically prepare storage devices
Using FAI disk_config files, setup-storage computes effective
partition and volume sizes and executes the necessary commands
NOTE: this new script fixes a piuparts bug #769097, this bug is important
NOTE: it only removes some lock files in /var/lib/nfs which are created by a exportfs call
--- fai-4.3/debian/fai-quickstart.postrm 1970-01-01 01:00:00.000000000 +0100
+++ fai-4.3.1/debian/fai-quickstart.postrm 2014-11-19 15:34:53.000000000 +0100
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ remove|purge)
+ rm -f /var/lib/nfs/.xtab.lock /var/lib/nfs/.etab.lock /var/lib/nfs/export-lock
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
NOTE: This script is only included in the sources, because it's mostly
NOTE: used by the FAI developers, but is not yet included in any of the fai-* packages
NOTE: - the temporary directory was changed
NOTE: - a comment was added
NOTE: - the deprecated option boot=on was removed
--- fai-4.3/dev-utils/fai-kvm 2012-04-13 03:21:54.000000000 +0200
+++ fai-4.3.1/dev-utils/fai-kvm 2014-11-13 14:05:03.000000000 +0100
@@ -14,7 +14,7 @@
ram=2000
disks=1
cdimage=/files/scratch/fai-cd.iso # default name for CD image
-diskdir=/dev/shm # directory where the disk images will be created
+diskdir=/tmp # directory where the disk images will be created, a RAM disk is recommended
# - - - - - - - - - - - - - - - - - - - - - - - - -
boot_pxe() {
@@ -71,6 +71,14 @@
hex=$(echo $user 16o p | dc)
diskfile=$diskdir/faitest-disk-$user
+
+# not all mac addresses work in kvm (or the bridge), be carefull when changing the first two bytes
+# If you are generating your own MAC addresses you should use a value that contains 2,6,A or E as the second number as this defines a locally administered MAC address.
+# x2:xx:xx:xx:xx:xx
+# x6:xx:xx:xx:xx:xx
+# xA:xx:xx:xx:xx:xx
+# xE:xx:xx:xx:xx:xx
+
mac=52:54:00:11:23:$hex
net="-net nic,macaddr=$mac,model=virtio -net tap,ifname=tap$user,script=no,downscript=no"
@@ -78,7 +86,7 @@
for i in `seq 1 $disks` ; do
disk="$disk -drive file=$diskfile-$i.qcow2,if=virtio,index=$i"
if [ $i -eq 1 ] ; then
- disk="$disk,boot=on"
+ disk="$disk"
fi
done
gopt="$fix -m $ram -smp 2 -name FAI-test"
NOTE: This is the fix for #769923, the bug is important
--- fai-4.3/lib/setup-storage/Init.pm 2014-09-26 16:42:54.000000000 +0200
+++ fai-4.3.1/lib/setup-storage/Init.pm 2014-11-16 22:55:40.000000000 +0100
@@ -100,7 +100,8 @@
# first time
#
################################################################################
-$FAI::reinstall = $ENV{flag_initial} // 1;
+$FAI::reinstall = 1;
+$ENV{flag_initial} and $FAI::reinstall = 0;
################################################################################
#
Please consider unblocking it.
--
regards Thomas
Reply to: