--- Begin Message ---
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock package fai 5.8.4.
It contains three bug fixes and some minor documentaion changes.
This is the debdiff from 5.8.3 to 5.8.4
diff -Nru fai-5.8.3/bin/fai-make-nfsroot fai-5.8.4/bin/fai-make-nfsroot
--- fai-5.8.3/bin/fai-make-nfsroot 2019-03-07 20:52:42.000000000 +0100
+++ fai-5.8.4/bin/fai-make-nfsroot 2019-03-21 20:23:52.000000000 +0100
@@ -263,6 +263,9 @@
targetarch=$(echo "$(expr "$FAI_DEBOOTSTRAP_OPTS" : '.*--arch[=[:space:]]\([^[:space:]]*\)' || true)" | tail -n 1)
hostarch1=$(dpkg --print-architecture)
hostarch2=$(dpkg --print-foreign-architectures)
+ if [ -z "$hostarch2" ]; then
+ hostarch2=$hostarch1
+ fi
_debootstrap=qemu-debootstrap
if [ -z "$targetarch" ]; then
diff -Nru fai-5.8.3/bin/install_packages fai-5.8.4/bin/install_packages
--- fai-5.8.3/bin/install_packages 2019-03-07 20:52:42.000000000 +0100
+++ fai-5.8.4/bin/install_packages 2019-03-21 20:23:37.000000000 +0100
@@ -282,7 +282,7 @@
if (/^PACKAGES\s+(\S+)\s*/) {
($type,$cllist) = ($1,$');
- warn "WARNING: Unknow action $type after PACKAGES\n" unless defined $command{$type};
+ warn "WARNING: Unknown action $type after PACKAGES\n" unless defined $command{$type};
# by default no classes are listed after this command so doit
$doit = 1;
if ($cllist) {
diff -Nru fai-5.8.3/debian/changelog fai-5.8.4/debian/changelog
--- fai-5.8.3/debian/changelog 2019-03-12 17:03:56.000000000 +0100
+++ fai-5.8.4/debian/changelog 2019-03-27 22:44:02.000000000 +0100
@@ -1,3 +1,19 @@
+fai (5.8.4) unstable; urgency=low
+
+ [ Thomas Lange ]
+ * updatebase: mount /run/udev into /target, Closes: #925247
+ * fai-cd.8: improve -d description
+ * fix several typos
+
+ [ Björn Torkelsson ]
+ * fai-make-nfsroot: foreign architecture may not be defined
+ Closes: #925246
+
+ [ Nicolas Souedet ]
+ * Commands.pm: fix wrong Perl dereferencing, Closes: #925469
+
+ -- Thomas Lange <lange@debian.org> Wed, 27 Mar 2019 22:44:02 +0100
+
fai (5.8.3) unstable; urgency=medium
* fai-server.prerm: add test, Closes: #924227
diff -Nru fai-5.8.3/doc/fai-guide.txt fai-5.8.4/doc/fai-guide.txt
--- fai-5.8.3/doc/fai-guide.txt 2019-03-07 20:52:42.000000000 +0100
+++ fai-5.8.4/doc/fai-guide.txt 2019-03-24 18:25:51.000000000 +0100
@@ -816,7 +816,7 @@
_extrbase_. Use this if you want to install another distribution or
version than that running during the installation.
+
-This basefile can also be received based on FAI classes via HTTP/HTPPS or FTP
+This basefile can also be received based on FAI classes via HTTP/HTTPS or FTP
by defining the variable +FAI_BASEFILEURL+. FAI will download a file
CLASSNAME.tar.xz (or tgz, or tar.gz,...) from this URL, if CLASSNAME
matches a FAI class.
diff -Nru fai-5.8.3/examples/simple/class/FAIBASE.var fai-5.8.4/examples/simple/class/FAIBASE.var
--- fai-5.8.3/examples/simple/class/FAIBASE.var 2018-03-10 21:02:12.000000000 +0100
+++ fai-5.8.4/examples/simple/class/FAIBASE.var 2019-03-26 16:37:03.000000000 +0100
@@ -14,7 +14,7 @@
# errors in tasks greater than this value will cause the installation to stop
STOP_ON_ERROR=700
-# set parameter for install_packges(8)
+# set parameter for install_packages(8)
MAXPACKAGES=800
# a user account will be created
diff -Nru fai-5.8.3/lib/setup-storage/Commands.pm fai-5.8.4/lib/setup-storage/Commands.pm
--- fai-5.8.3/lib/setup-storage/Commands.pm 2019-03-07 20:52:42.000000000 +0100
+++ fai-5.8.4/lib/setup-storage/Commands.pm 2019-03-27 19:14:41.000000000 +0100
@@ -881,7 +881,7 @@
# prevent error due to different VG name of existing VG
if (defined($FAI::configs{$d})) {
# don't deactivate preserved VGs to prevent blkid error later on
- foreach my $v (keys %{ $FAI::configs->{$d}->{volumes} }) {
+ foreach my $v (keys %{ $FAI::configs{$d}->{volumes} }) {
$preserved = 1 if ($FAI::configs{$d}{volumes}{$v}{size}{preserve});
}
}
diff -Nru fai-5.8.3/lib/subroutines fai-5.8.4/lib/subroutines
--- fai-5.8.3/lib/subroutines 2019-03-07 20:52:42.000000000 +0100
+++ fai-5.8.4/lib/subroutines 2019-03-21 20:23:46.000000000 +0100
@@ -792,7 +792,7 @@
echo "Kernel currently running: "
uname -rsmo
cmdline="$(</proc/cmdline)"
- echo -n "Kernel parameters: $cmdline"
+ echo "Kernel parameters: $cmdline"
for word in $cmdline; do
if echo "$word" | egrep -q '^[a-zA-Z0-9_]+=' ; then
eval "export $word"
diff -Nru fai-5.8.3/lib/updatebase fai-5.8.4/lib/updatebase
--- fai-5.8.3/lib/updatebase 2019-03-07 20:52:42.000000000 +0100
+++ fai-5.8.4/lib/updatebase 2019-03-25 21:23:20.000000000 +0100
@@ -13,6 +13,8 @@
if [ -f /etc/init.d/udev ]; then
mount --bind /dev $FAI_ROOT/dev
mount --make-private $FAI_ROOT/dev
+ mkdir -p $target/run/udev
+ mount --bind /run/udev $target/run/udev
fi
mount -t devpts devpts $FAI_ROOT/dev/pts
mount --make-private $FAI_ROOT/dev/pts
diff -Nru fai-5.8.3/man/fai-cd.8 fai-5.8.4/man/fai-cd.8
--- fai-5.8.3/man/fai-cd.8 2019-03-07 20:52:42.000000000 +0100
+++ fai-5.8.4/man/fai-cd.8 2019-03-22 14:10:41.000000000 +0100
@@ -91,10 +91,10 @@
/etc/fai. You can also set the environment variable FAI_ETC_DIR.
.TP
.BI "\-d " URL
-Do not include the config space in the image and set the location of the
-config space to URL. This sets FAI_CONFIG_SRC in the grub config, which
+Do not include the config space in the image. Instead set the variable
+to the location of the config space to URL. This sets FAI_CONFIG_SRC in the grub config, which
is obtained from the FAI configuration dir (see -C). Set it to "" to not
-set FAI_CONFIG_SRC. If not set, the config space is taken from
+set FAI_CONFIG_SRC at all. If not set, the config space is taken from
FAI_CONFIGDIR and copied to /var/lib/fai/config in the image. Currently
no file: is allowed here, instead set FAI_CONFIGDIR in nfsroot.conf(5).
.TP
--
regards Thomas
--- End Message ---