Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: pu Tags: wheezy thanks Hi, as the stable release manager of FAI I'm kindly asking for letting src:fai 4.0.8 enter the upcoming wheezy point release update. We've FAI 4.0.8 sitting in jessie/unstable since ~2 weeks without any reported problems. The 4.0.7 version was specially released as stable update to address #719213, #720307 and update documentation. Version 4.0.8 just fixes a forgotten cherry-pick from the 4.0.7 upload (so the change was already part of FAI 4.0.6). The debdiff of FAI 4.0.6 (being part of current wheezy) and FAI 4.0.8 is attached. Thanks for consideration and regards, -mika-
diff -Nru fai-4.0.6/bin/fai-make-nfsroot fai-4.0.8/bin/fai-make-nfsroot
--- fai-4.0.6/bin/fai-make-nfsroot 2012-11-28 15:30:21.000000000 +0100
+++ fai-4.0.8/bin/fai-make-nfsroot 2013-08-20 11:30:22.000000000 +0200
@@ -378,7 +378,7 @@
# Work around Ubuntu's failure in installing rsyslog with
# "start: Unable to connect to Upstart: Failed to connect to
# socket /com/ubuntu/upstart: Connection refused"
- if $ROOTCMD test -x /usr/sbin/dpkg-divert && [ -x $NFSROOT/sbin/initctl ] ; then
+ if $ROOTCMD which dpkg-divert >/dev/null 2>&1 && [ -x $NFSROOT/sbin/initctl ] ; then
LC_ALL=C $ROOTCMD dpkg-divert --quiet --add --rename /sbin/initctl
ln -sf /bin/true $NFSROOT/sbin/initctl
INITCTL_DIVERT=true
diff -Nru fai-4.0.6/conf/NFSROOT fai-4.0.8/conf/NFSROOT
--- fai-4.0.6/conf/NFSROOT 2012-11-15 14:10:34.000000000 +0100
+++ fai-4.0.8/conf/NFSROOT 2013-08-20 11:30:22.000000000 +0200
@@ -29,14 +29,14 @@
#git # git consumes a lot of disk space on the FAI CD (ISO 9660)
PACKAGES aptitude I386
-grub read-edid
+grub-pc read-edid
linux-image-686
# packages for Ubuntu natty/oneiric/precise:
# linux-image-generic live-boot
PACKAGES aptitude AMD64
-grub
+grub-pc
linux-image-amd64
# packages for Ubuntu natty/oneiric/precise:
diff -Nru fai-4.0.6/debian/changelog fai-4.0.8/debian/changelog
--- fai-4.0.6/debian/changelog 2013-02-01 21:33:38.000000000 +0100
+++ fai-4.0.8/debian/changelog 2013-09-03 17:26:06.000000000 +0200
@@ -1,3 +1,28 @@
+fai (4.0.8) unstable; urgency=low
+
+ * Cherry-pick change for #699555 from 4.0.6 release which was
+ forgotten in the 4.0.7 upload.
+
+ -- Michael Prokop <mika@debian.org> Tue, 03 Sep 2013 17:25:10 +0200
+
+fai (4.0.7) unstable; urgency=low
+
+ * lib/task_sysinfo: make sure device is a valid block device before
+ acccessing it
+ * conf/NFSROOT: use grub-pc instead of grub package [Closes: #719213]
+ * Do not depend on dpkg-divert being available inside /usr/sbin
+ [Closes: #720307]
+ * Makefile: update list of bash, shell land perl scripts
+ * fai-guide/doc related changes:
+ - update repository information + feature list
+ - bunch of typo fixes
+ - fix name of dirinstall task
+ - update log file names regarding live-initramfs + klibc versions
+ - fix usage of it's <-> its
+ - replace "quiet" with "quite" and "setup" with "set up"
+
+ -- Michael Prokop <mika@debian.org> Tue, 20 Aug 2013 11:32:53 +0200
+
fai (4.0.6) unstable; urgency=low
* do not reboot if error.log is empty Closes: #699279, #690016
diff -Nru fai-4.0.6/doc/fai-guide.txt fai-4.0.8/doc/fai-guide.txt
--- fai-4.0.6/doc/fai-guide.txt 2012-03-01 13:46:11.000000000 +0100
+++ fai-4.0.8/doc/fai-guide.txt 2013-08-20 11:30:22.000000000 +0200
@@ -99,7 +99,7 @@
http://fai-project.org/download
Entry for 'sources.list'::
-`http://fai-project.org/download lenny koeln`
+`deb http://fai-project.org/download wheezy koeln`
Mailing list::
https://lists.uni-koeln.de/mailman/listinfo/linux-fai
@@ -116,12 +116,12 @@
http://fai-project.org/NEWS
Source tree::
-You can access the subversion repository containing the newest
-developer version of FAI using the following commands
-`svn co svn://svn.debian.org/svn/fai/trunk fai`
+You can access the Git repository containing the newest
+developer version of FAI using the following command
+`git clone git://github.com/faiproject/fai.git`
Source tree via http::
-http://svn.debian.org/wsvn/fai/
+https://github.com/faiproject/fai
Now read this manual, then enjoy the fully automatic installation and
your saved time.
@@ -260,8 +260,8 @@
* Hosts can boot from network card, CD, USB stick.
* Simple creation of the CD and USB stick.
* PXE with DHCP and BOOTP boot methods are supported.
-* Lilo and grub support.
-* ReiserFS, ext3 and XFS file system support.
+* Grub support.
+* ReiserFS, ext3/ext4 and XFS file system support.
* Software RAID and LVM support.
* Automatic hardware detection.
* Remote login via ssh during installation process possible.
@@ -408,7 +408,7 @@
=== [[faisetup]]Setting up FAI
-To setup a FAI install server you need at least the packages
+To set up a FAI install server you need at least the packages
_fai-server_ and _fai-doc_. The package _fai-quickstart_ contains
dependencies on all required packages for an install server. Do not
install the package _fai-nfsroot_ on a normal system. This package can
@@ -447,7 +447,7 @@
system should be built.
NFSROOT_ETC_HOSTS::
-If you use HTTP or FTP access to the Debain mirror, add its IP-address
+If you use HTTP or FTP access to the Debian mirror, add its IP-address
and the name to this variable. For a Beowulf master node, add the name
and IP-address of both networks to it. This variable is not needed
when the clients have access to a DNS server.
@@ -482,7 +482,7 @@
a recognized suffix, such as .tar.gz.
If +$FAI_CONFIG_SRC+ is undefined in 'fai.conf', then the default is
-to use an NFS mount from the fai install server onto the install
+to use an NFS mount from the FAI install server onto the install
client. It's the same as +nfs://`hostname`/$FAI_CONFIGDIR+ with the
host name determined on the install server. Remember that this
directory must be exported to all install clients, so that all files
@@ -504,7 +504,7 @@
known by the install clients.
FAI uses `debootstrap(8)` and `apt-get(8)` to create the nfsroot file
-system in '/srv/fai/nfsroot'. It needs about {nfsrootsize} of free
+system in '/srv/fai/nfsroot'. It needs about {nfsrootsize}MB of free
disk space. After editing 'fai.conf' and 'make-fai-nfsroot.conf' call
`fai-setup`.
@@ -632,7 +632,7 @@
kernel that was created with `mknbi-linux(8)`. A lot of ethernet
cards support booting via ethernet if a special boot EPROM is inserted
or booted from floppy provided by http://rom-o-matic.net. In depth
-documentation about booting via ethernet may be found at
+documentation about booting via Ethernet may be found at
http://www.etherboot.org.
@@ -750,10 +750,12 @@
(initramfs)
----
-You will get a shell prompt and can look at the log files, for
-examples '/live.log' or '/tmp/net-eth0.conf'. You can also enter the
-initramfs shell for debugging if you append the parameter 'break' to
-the kernel command line.
+You will get a shell prompt and can look at the log files, for example
+'/live.log' or /live-boot.log' (depending on the live-initramfs version) and
+'/tmp/net-eth0.conf' or '/run/net-eth0.conf' (depending on the klibc version).
+You can also enter the initramfs shell for debugging if you append the parameter
+'break' to the kernel command line (see `initramfs-tools(8)` for further
+information).
Use the following command on the install server to see which directories are exported
from the install server (named faiserver):
@@ -824,7 +826,7 @@
////
Two additional symbolic links are created. The symlink 'last' points
-to the log directory of the last fai action performed. The symlinks
+to the log directory of the last FAI action performed. The symlinks
'last-install' and 'last-sysinfo' point to the directory with of the
last corresponding action. Examples of the log files can be found on
the FAI homepage.
@@ -898,7 +900,7 @@
extrbase # extract the minimal base.tgz
mirror # get a Debian mirror via NFS
debconf # do Debian preseeding
- repository # preapre access to the package repository
+ repository # prepare access to the package repository
updatebase # Debian specific
HOOK instsoft.FAIBASE # fcopy kernel-img.conf
instsoft # install software packages
@@ -914,7 +916,7 @@
These are tasks, which are executed when a different action is performed
- dirinstal # install a chroot environment
+ dirinstall # install a chroot environment
softupdate # do a system configuration without the partitioning part
____
@@ -948,7 +950,7 @@
command `faimond(8)`. All clients check if this daemon is running on
the install server (or the machine defined by the variable
+$monserver+). Then, a message is sent when a task starts and ends. The
-fai monitor daemon prints this messages to standard output. There's
+FAI monitor daemon prints this messages to standard output. There's
also a graphical frontend available, called `faimond-gui(1)`.
@@ -966,14 +968,14 @@
After the root file system is mounted read only, it is made writable
by mounting a RAM disk via aufs (another unionfs) on top of it. So
-it's possible for programms or daemons to write to files inside a read
+it's possible for programs or daemons to write to files inside a read
only mounted file system. We are using the package
`live-initramfs(7)` to mount the nfsroot and to make this file system
writable using aufs. The package _live-initramfs_ is only needed
inside the nfsroot and adds some initramfs hooks.
-=== [[isetup]]Start and setup FAI
+=== [[isetup]]Start and set up FAI
////
MT: CVS, SVN missing
@@ -1081,7 +1083,7 @@
After the customization scripts are executed, FAI will execute some
tests if available. Using these test, you can check for errors of the
installation or of the softupdate. Test scripts are called via
-`fai-do-scripts(1)` and should append it's messages to
+`fai-do-scripts(1)` and should append its messages to
_$LOGDIR/test.log_. A Perl module including some useful subroutines
can be found in _Faitest.pm_. A test can also define a new class for
executing another tests during next boot via the variable
@@ -1494,12 +1496,12 @@
Reboot the install client after installation is finished without
typing RETURN on the console. If this flag is not set, and error.log
contains anything, the install client will stop and wait that you
-press RETURN. If no errors occured, the client will always reboot
+press RETURN. If no errors occurred, the client will always reboot
automatically.
initial::
Used by `setup-storage(8)`. Partitions marked with +preserve_reinstall+
-are preserved unless this flag ist set. Often, this flag is set in a
+are preserved unless this flag is set. Often, this flag is set in a
file 'class/*.var' by using setting 'flag_initial=1'.
@@ -1571,7 +1573,7 @@
but may contain underscores. A description of all classes can be found
in '/usr/share/doc/fai-doc/classes_description.txt'.
-host names should rarely be used for the configuration files in the
+Host names should rarely be used for the configuration files in the
configuration space. Instead, a class should be defined and then added
for a given host. This is because most of the time the configuration
data is not specific for one host, but can be shared among several
@@ -1630,7 +1632,7 @@
useful for your installation:
FAI_ACTION::
-Set the action fai should perform. Normally this is done by
+Set the action FAI should perform. Normally this is done by
`fai-chboot(8)`. If you can't use this command, define it in the
script 'LAST.var'.
@@ -1682,10 +1684,10 @@
////
-Before installing packages, fai will add the content of all files
+Before installing packages, FAI will add the content of all files
named _package_config/*.asc_ to the list of apt keys. If your local
repository is signed by your keyid AB12CD34 you can easily add this key,
-so fai will use it during installation. Use this command for creating
+so FAI will use it during installation. Use this command for creating
the '.asc' file:
----
@@ -1836,7 +1838,7 @@
AppendIfNoSuchLine, HashCommentLinesContaining_. But it can't handle
variables which are undefined. If a variable is undefined, the whole
cfengine script will abort. Study the examples that are included in
-the fai package.
+the FAI package.
More information can be found in the manual page `cfengine(8)` or at
the cfengine homepage http://www.cfengine.org.
@@ -2036,7 +2038,7 @@
This chapter describes the details about building a Beowulf cluster
using Debian/GNU Linux and FAI. This chapter was written for FAI
version 2.x for Debian woody and was not yet updated. The example
-configuration files were removed from the fai packages after FAI
+configuration files were removed from the FAI packages after FAI
2.8.4.
For more information about the Beowulf concept look at
@@ -2301,11 +2303,11 @@
These are things that may have to be changed on other architectures:
Boot loader::
-There are scripts for setting up `lilo(8)` and `grub(8)`. Here you may
+There are scripts for setting up `grub(8)`. Here you may
add support for your specific boot loader.
If you want to serve multiple nfsroot directories on one FAI server,
-you need to create specific config directories in '/etc' for fai, like
+you need to create specific config directories in '/etc' for FAI, like
'/etc/fai-sarge' and '/etc/fai-etch'. Then you need to set the
+$NFSROOT+ variables to different directories and run
@@ -2317,7 +2319,7 @@
To install a computer with a 32bit i386 system, you need an i386 nfsroot.
Creating this 32bit nfsroot on an install server runnning amd64 is
-quiet simple. Install and setup the fai packages. Then copy your fai
+quite simple. Install and set up the FAI packages. Then copy your FAI
config files to a new subdirectory.
----
@@ -2356,14 +2358,14 @@
=== [[powerpc]]FAI on PowerPC
There's some stuff on http://www.layer-acht.org/fai. Most notably
-there are hooks for partitioning and config-files to setup bootloaders
+there are hooks for partitioning and config-files to set up bootloaders
for oldworld and newworld.
=== [[ia64]]FAI on IA64
There's one big IA64 Beowulf cluster running which was installed with
FAI. Only the partitioning part has to be replaced by a short script,
since sfdisk is not available on IA64. This should not be need any
-more since the patitioning tool `setup-storage(8)` works on all
+more since the partitioning tool `setup-storage(8)` works on all
architectures, were parted is supported.
@@ -2516,7 +2518,7 @@
starts a softupdate.
Make sure to set the variable +$LOGSERVER+ (done in a _class/*.var_
-file) if fai should save the log files to a remote machine.
+file) if FAI should save the log files to a remote machine.
===== How to do mass softupdates
Probably you don't want to run to each client and start a softupdate
@@ -2617,7 +2619,7 @@
has been changed locally. A simple approach would be to use _debsums
-e_, but this method fails miserably if you modify conffiles in your
FAI scripts, because it only checks against the version contained in
-the Debian package. A better proposal is to setup/abuse `tripwire(8)` or
+the Debian package. A better proposal is to set up/abuse `tripwire(8)` or
`integrit(1)` to scan for local changes and notify you about them.
@@ -2707,7 +2709,7 @@
IP address, and to define classes for this host if the existing
configuration files are not generic enough to deal with this new host.
-There's a tradeoff between writing a few large configuration scripts,
+There's a trade-off between writing a few large configuration scripts,
or many short scripts, one for each class. Large scripts can
distinguish classes by using case statements, the _ifclass_ test or
with class mechanisms for _cfengine_ scripts.
diff -Nru fai-4.0.6/lib/fai-divert fai-4.0.8/lib/fai-divert
--- fai-4.0.6/lib/fai-divert 2012-02-07 23:23:28.000000000 +0100
+++ fai-4.0.8/lib/fai-divert 2013-08-20 11:30:22.000000000 +0200
@@ -92,10 +92,10 @@
[ "$1" ] || usage
# do not execute if command is not available
-[ -f $FAI_ROOT/usr/sbin/dpkg-divert ] || {
- echo "$FAI_ROOT/usr/sbin/dpkg-divert not available. Skipping."
+if ! $ROOTCMD which dpkg-divert >/dev/null 2>&1 ; then
+ echo "dpkg-divert in $FAI_ROOT not available. Skipping." >&2
exit 1
-}
+fi
while getopts arRhv opt ; do
case "$opt" in
diff -Nru fai-4.0.6/lib/task_sysinfo fai-4.0.8/lib/task_sysinfo
--- fai-4.0.6/lib/task_sysinfo 2012-05-22 15:59:48.000000000 +0200
+++ fai-4.0.8/lib/task_sysinfo 2013-08-20 11:30:22.000000000 +0200
@@ -62,6 +62,7 @@
/etc/init.d/mdadm-raid start
for device in /dev/sd?; do
+ [ -b "$device" ] || continue # make sure device exists and is valid block device
[ `stat -c %G $device` = "disk" ] || continue
hdparm -I $device | egrep -v '^$' | head -5 | sed -e 's/^[[:blank:]]*//'
done
diff -Nru fai-4.0.6/Makefile fai-4.0.8/Makefile
--- fai-4.0.6/Makefile 2012-04-26 22:38:53.000000000 +0200
+++ fai-4.0.8/Makefile 2013-08-20 12:06:44.000000000 +0200
@@ -10,9 +10,9 @@
USRBIN_SCRIPTS = fai-class fai-do-scripts fai-mirror fai-debconf device2grub policy-rc.d.fai ainsl fai-monitor-gui fai-deps
# for syntax checks
-BASH_SCRIPTS = lib/fai-divert lib/fai-mount-disk lib/fai-savelog lib/fai-vol_id lib/get-boot-info lib/get-config-dir lib/get-config-dir-cvs lib/get-config-dir-file lib/get-config-dir-git lib/get-config-dir-hg lib/get-config-dir-nfs lib/get-config-dir-svn lib/mkramdisk lib/mount2dir lib/prcopyleft lib/subroutines lib/task_sysinfo lib/updatebase lib/fetch-basefile
-SHELL_SCRIPTS = lib/check_status lib/create_resolv_conf lib/updatebase lib/fai-abort lib/fai-divert lib/load_keymap_consolechars lib/fai-disk-info lib/list_disks utils/mkdebmirror bin/policy-rc.d.fai bin/dhclient-fai-script
-PERL_SCRIPTS = lib/setup-storage/*.pm bin/ainsl bin/device2grub bin/dhcp-edit bin/fai-chboot bin/fai-monitor bin/fai-monitor-gui bin/fcopy bin/install_packages bin/setup-storage examples/simple/tests/Faitest.pm lib/dhclient-perl lib/fai-savelog-ftp bin/fai-new-mac
+BASH_SCRIPTS = bin/fai bin/fai-cd bin/fai-class bin/fai-debconf bin/fai-do-scripts bin/fai-make-nfsroot bin/fai-mirror bin/fai-nfsroot2image bin/fai-setup bin/fai-statoverride bin/faireboot bin/ftar dev-utils/fai-kvm examples/simple/basefiles/mk-basefile examples/simple/class/* examples/simple/files/etc/rc.local/FAISERVER examples/simple/hooks/* examples/simple/scripts/CENTOS/* examples/simple/scripts/DEBIAN/* examples/simple/scripts/DEMO/* examples/simple/scripts/FAIBASE/* examples/simple/scripts/FAISERVER/* examples/simple/scripts/GRUB_PC/* examples/simple/scripts/LAST/* lib/fai-divert lib/fai-mount-disk lib/fai-savelog lib/fai-vol_id lib/fetch-basefile lib/get-boot-info lib/get-config-dir lib/get-config-dir-cvs lib/get-config-dir-file lib/get-config-dir-git lib/get-config-dir-hg lib/get-config-dir-http lib/get-config-dir-nfs lib/get-config-dir-svn lib/mkramdisk lib/mount2dir lib/prcopyleft lib/subroutines lib/task_sysinfo lib/updatebase
+SHELL_SCRIPTS = bin/dhclient-fai-script bin/policy-rc.d.fai lib/check_status lib/create_resolv_conf lib/fai-abort lib/fai-disk-info lib/load_keymap_consolechars utils/mkdebmirror
+PERL_SCRIPTS = lib/setup-storage/*.pm bin/ainsl bin/device2grub bin/dhcp-edit bin/fai-chboot bin/fai-deps bin/fai-monitor bin/fai-monitor-gui bin/fai-new-mac bin/fcopy bin/install_packages bin/setup-storage dev-utils/setup-storage_deps-graph.pl examples/simple/tests/Faitest.pm lib/dhclient-perl lib/fai-savelog-ftp
# do not include .svn dir and setup-storage subdir
libfiles=$(patsubst lib/setup-storage,,$(wildcard lib/[a-z]*))
Attachment:
signature.asc
Description: Digital signature