Package: release.debian.org
User: release.debian....@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock package fai
The changes from 5.8.1 to 5.8.3 are fixing the piuparts RC bug #924227.
In fai-mirror the hardcoded release name stretch was replaced by a
regex. In other configuration files stretch was now replaced by buster.
In conf/NFSROOT two package names were replaced by smaller
alternatives and I had to add the gpg package for the DEBIAN_10 and
DEBIAN_11 environments. Other changes are documentation updates.
diff -Nru fai-5.8.1/bin/fai-mirror fai-5.8.3/bin/fai-mirror
--- fai-5.8.1/bin/fai-mirror 2018-05-28 11:21:24.000000000 +0200
+++ fai-5.8.3/bin/fai-mirror 2019-03-07 20:52:42.000000000 +0100
@@ -5,7 +5,7 @@
# fai-mirror -- create and manage a partial mirror for FAI
#
# This script is part of FAI (Fully Automatic Installation)
-# (c) 2004-2018, Thomas Lange, la...@informatik.uni-koeln.de
+# (c) 2004-2019, Thomas Lange, la...@informatik.uni-koeln.de
#
#*********************************************************************
# This program is free software; you can redistribute it and/or modify
@@ -259,7 +259,7 @@
fi
# check if backports are used
-bpo=$(awk '/^deb .+-backports / {print $3}' $aptcache/etc/apt/sources.list)
+bpo=$(egrep '^deb ' $aptcache/etc/apt/sources.list | grep -P -o
'\S+-backports')
if [ -f "$aptpref" ]; then
cp "$aptpref" $aptcache/etc/apt/preferences
@@ -317,7 +317,7 @@
EOF
# maybe using reprepro pulls it's possible to move instead of copy the packages
- reprepro -b $mirrordir includedeb stretch-backports
$archivedir/*~bpo[0-9]*+[0-9-]*_*.deb
+ reprepro -b $mirrordir includedeb $bpo
$archivedir/*~bpo[0-9]*+[0-9-]*_*.deb
rm -f $archivedir/*~bpo[0-9]*+[0-9-]*_*.deb
fi
diff -Nru fai-5.8.1/conf/NFSROOT fai-5.8.3/conf/NFSROOT
--- fai-5.8.1/conf/NFSROOT 2019-02-08 23:27:37.000000000 +0100
+++ fai-5.8.3/conf/NFSROOT 2019-03-11 14:53:27.000000000 +0100
@@ -7,9 +7,9 @@
dump reiserfsprogs xfsprogs xfsdump btrfs-progs dosfstools
hwinfo hdparm smartmontools
subversion rdate
-emacs25-nox
+zile
numactl
-dnsutils
+udns-utils
netcat-traditional nmap
pxelinux syslinux-common # in jessie we need both
ca-certificates # for get-config-dir-https and apt-transport-https
@@ -54,7 +54,7 @@
grub-pc
efibootmgr
linux-image-amd64
-#linux-image-amd64/stretch-backports # if you want to use a newer kernel
+#linux-image-amd64/buster-backports # if you want to use a newer kernel
PACKAGES install-norec ARM64
grub-efi-arm64
@@ -70,7 +70,7 @@
apt-transport-https
PACKAGES install-norec DEBIAN_10
-fdisk
+fdisk gpg
PACKAGES install-norec DEBIAN_11
-fdisk
+fdisk gpg
diff -Nru fai-5.8.1/conf/nfsroot.conf fai-5.8.3/conf/nfsroot.conf
--- fai-5.8.1/conf/nfsroot.conf 2018-03-10 21:42:17.000000000 +0100
+++ fai-5.8.3/conf/nfsroot.conf 2019-03-11 14:25:38.000000000 +0100
@@ -1,7 +1,7 @@
# For a detailed description see nfsroot.conf(5)
# "<suite> <mirror>" for debootstrap
-FAI_DEBOOTSTRAP="stretch http://deb.debian.org/debian";
+FAI_DEBOOTSTRAP="buster http://deb.debian.org/debian";
FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
NFSROOT=/srv/fai/nfsroot
diff -Nru fai-5.8.1/conf/sources.list fai-5.8.3/conf/sources.list
--- fai-5.8.1/conf/sources.list 2018-03-10 21:42:17.000000000 +0100
+++ fai-5.8.3/conf/sources.list 2019-03-11 14:25:38.000000000 +0100
@@ -1,8 +1,8 @@
# These lines should work for many sites
-deb http://deb.debian.org/debian stretch main contrib non-free
-deb http://deb.debian.org/debian-security stretch/updates main contrib non-free
-#deb http://deb.debian.org/debian stretch-backports main contrib non-free
+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
-# repository that may contain newer fai packages for stretch
-deb [trusted=yes] http://fai-project.org/download stretch koeln
+# repository that may contain newer fai packages for buster
+deb [trusted=yes] http://fai-project.org/download buster koeln
diff -Nru fai-5.8.1/debian/changelog fai-5.8.3/debian/changelog
--- fai-5.8.1/debian/changelog 2019-02-14 15:44:08.000000000 +0100
+++ fai-5.8.3/debian/changelog 2019-03-12 17:03:56.000000000 +0100
@@ -1,3 +1,22 @@
+fai (5.8.3) unstable; urgency=medium
+
+ * fai-server.prerm: add test, Closes: #924227
+ * NFSROOT: add gpg for buster and beyond
+
+ -- Thomas Lange <la...@debian.org> Tue, 12 Mar 2019 17:03:56 +0100
+
+fai (5.8.2) unstable; urgency=low
+
+ * NFSROOT,nfsroot.conf,sources.list,mkdebmirror: change defaults
+ to buster
+ * fai-mirror: better regex for matching the backports name,
+ do not use hardcoded release name
+ * conf/NFSROOT: replace big packages with smaller replacements
+ * README.build-sources: fix git command
+ * README: major rewrite
+
+ -- Thomas Lange <la...@debian.org> Thu, 07 Mar 2019 22:29:46 +0100
+
fai (5.8.1) unstable; urgency=low
* 30-interfaces: add support for Ubuntu's netplan
diff -Nru fai-5.8.1/debian/fai-server.prerm fai-5.8.3/debian/fai-server.prerm
--- fai-5.8.1/debian/fai-server.prerm 2018-01-19 14:00:17.000000000 +0100
+++ fai-5.8.3/debian/fai-server.prerm 2019-03-10 17:47:06.000000000 +0100
@@ -42,7 +42,9 @@
fi
perl -ni.bak -e "print unless m#^$FAI_CONFIGDIR\s|^$NFSROOT\s#"
/etc/exports
- invoke-rc.d nfs-kernel-server reload
+ if [ -f /etc/init.d/nfs-kernel-server ]; then
+ invoke-rc.d nfs-kernel-server reload
+ fi
rmdir $FAI_CONFIGDIR || true
diff -Nru fai-5.8.1/examples/simple/class/DEBIAN.var
fai-5.8.3/examples/simple/class/DEBIAN.var
--- fai-5.8.1/examples/simple/class/DEBIAN.var 2018-03-10 21:02:12.000000000
+0100
+++ fai-5.8.3/examples/simple/class/DEBIAN.var 2019-03-08 09:05:18.000000000
+0100
@@ -1,4 +1,4 @@
-release=stretch
+release=buster
apt_cdn=http://deb.debian.org
security_cdn=http://security.debian.org
diff -Nru fai-5.8.1/examples/simple/files/etc/fai/nfsroot.conf/FAISERVER
fai-5.8.3/examples/simple/files/etc/fai/nfsroot.conf/FAISERVER
--- fai-5.8.1/examples/simple/files/etc/fai/nfsroot.conf/FAISERVER
2018-03-10 21:02:12.000000000 +0100
+++ fai-5.8.3/examples/simple/files/etc/fai/nfsroot.conf/FAISERVER
2019-03-08 09:05:18.000000000 +0100
@@ -1,7 +1,7 @@
# For a detailed description see nfsroot.conf(5)
# "<suite> <mirror>" for debootstrap
-FAI_DEBOOTSTRAP="stretch http://deb.debian.org/debian";
+FAI_DEBOOTSTRAP="buster http://deb.debian.org/debian";
FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
NFSROOT=/srv/fai/nfsroot
diff -Nru fai-5.8.1/examples/simple/files/etc/rc.local/FAISERVER
fai-5.8.3/examples/simple/files/etc/rc.local/FAISERVER
--- fai-5.8.1/examples/simple/files/etc/rc.local/FAISERVER 2018-08-26
17:53:23.000000000 +0200
+++ fai-5.8.3/examples/simple/files/etc/rc.local/FAISERVER 2019-03-08
09:05:18.000000000 +0100
@@ -79,7 +79,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
stretch.tmpl
+fai-chboot -Iv -f verbose,sshd,createvt,menu -u nfs://faiserver/srv/fai/config
buster.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.8.1/examples/simple/package_config/FAISERVER
fai-5.8.3/examples/simple/package_config/FAISERVER
--- fai-5.8.1/examples/simple/package_config/FAISERVER 2018-03-10
21:02:12.000000000 +0100
+++ fai-5.8.3/examples/simple/package_config/FAISERVER 2019-03-06
21:40:15.000000000 +0100
@@ -10,4 +10,4 @@
nscd psmisc
bind9 dnsutils
iptables-persistent
-emacs25-nox
+zile
diff -Nru fai-5.8.1/examples/simple/scripts/LAST/50-misc
fai-5.8.3/examples/simple/scripts/LAST/50-misc
--- fai-5.8.1/examples/simple/scripts/LAST/50-misc 2018-05-22
11:30:15.000000000 +0200
+++ fai-5.8.3/examples/simple/scripts/LAST/50-misc 2019-03-05
04:34:46.000000000 +0100
@@ -72,7 +72,7 @@
return
fi
- dists="jessie stretch buster bionic xenial trusty"
+ dists="jessie stretch buster bullseye bookworm bionic xenial trusty"
for d in $dists; do
if grep -iq $d $target/etc/os-release; then
release=$d
diff -Nru fai-5.8.1/README fai-5.8.3/README
--- fai-5.8.1/README 2018-12-31 15:11:17.000000000 +0100
+++ fai-5.8.3/README 2019-03-07 20:52:42.000000000 +0100
@@ -2,19 +2,18 @@
FAIVERSIONSTRING
-FAI is a non-interactive system to install, customize and manage Linux
-systems and software configurations on computers as well as virtual
-machines and chroot environments, from small networks to large
-infrastructures and clusters. It's a tool for mass unattended Linux
-installation. You can take one or more virgin systems, turn on the
-power, and after a few minutes, the systems are installed, and
-completely configured to your exact needs, without any interaction
-necessary. Thus it's a scalable method for deploying and updating a
-Beowulf cluster or a network of workstations unattended with little
-effort involved. FAI uses the Debian distribution and a collection of
-shell and Perl scripts for the installation process. Changes to the
-configuration files of the operating system are made by cfengine,
-shell and Perl scripts.
+FAI is a tool for unattended mass deployment of Linux. It's a system
+to install and configure Linux systems and software packages on
+computers as well as virtual machines, from small labs to large-scale
+infrastructures like clusters and virtual environments. You can take
+one or more virgin PC's, turn on the power, and after a few minutes,
+the systems are installed, and completely configured to your exact
+needs, without any interaction necessary. It can be used for creating
+custom disk images used in virtual machines or on a cloud-computing
+platform. FAI uses Debian Linux but it can install and deploy multiple
+distributions like Debian, Ubuntu, CentOS, RHEL and SUSE. Changes to
+the configuration files of the operating system can be made by shell
+or Perl scripts or any other configuration software.
The home page for FAI is
@@ -23,22 +22,15 @@
This release of FAI is tested with the Debian 9 release.
FAI is free software, distributed under the terms of the GNU General
-Public License, version 2. For more information, see the file
-COPYING. There is no warranty, expressed or implied, associated with
-this product. Use at your own risk. Please read the file changelog for
-changes in new versions of FAI. Comments, bug reports, fixes,
-enhancements etc. are welcome. Send them to
+Public License, version 2. There is no warranty, expressed or implied,
+associated with this product. Use at your own risk. Comments, bug
+reports, fixes, enhancements etc. are welcome. Send them to
f...@fai-project.org
Please fill out the questionnaire when you have finished a project
using FAI. https://fai-project.org/questionnaire
-I'm looking for short success stories or reports, so new users
-can see how others are using FAI in several types of environment.
-There's also a mailing list for FAI available. Mails may be
-written in english or german.
-https://lists.uni-koeln.de/mailman/listinfo/linux-fai
Checking out the FAI sources:
@@ -48,18 +40,10 @@
git checkout master
This command will also clone a git submodule which includes the FAI
-config space examples. If you have already checked out the git
-repository in the past (before the submodule was added), you have to
-issue these commands once:
-
-cd <to you working directory>
-git submodule init
-git submodule update
-cd examples/simple
-git checkout master
+config space examples.
-now enjoy FAI and your saved time
+Now enjoy FAI and your saved time
Thomas Lange
diff -Nru fai-5.8.1/README.build-sources fai-5.8.3/README.build-sources
--- fai-5.8.1/README.build-sources 2019-02-10 21:34:26.000000000 +0100
+++ fai-5.8.3/README.build-sources 2019-03-07 20:52:42.000000000 +0100
@@ -1,5 +1,8 @@
# check out the sources to the directory fai
git clone --recursive https://github.com/faiproject/fai.git
+cd examples/simple
+git checkout master
+cd ../..
# build the packages
cd fai
diff -Nru fai-5.8.1/utils/mkdebmirror fai-5.8.3/utils/mkdebmirror
--- fai-5.8.1/utils/mkdebmirror 2018-03-27 21:11:36.000000000 +0200
+++ fai-5.8.3/utils/mkdebmirror 2019-03-11 14:25:38.000000000 +0100
@@ -23,7 +23,7 @@
debug="$@"
arch=amd64
-dist=stretch,stretch-backports
+dist=buster,buster-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 stretch/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 buster/updates $*
