Package: release.debian.org
User: release.debian....@packages.debian.org
Usertags: unblock
Severity: normal
FAI 5.3.6 fixes two simple bugs (a wrong subroutine name and a wrong
variable name) and includes some document changes. Here's the changelog:
fai (5.3.6) unstable; urgency=low
[ Thomas Lange ]
* install_packages: fix subroutine name, Closes: #860783
thanks to John Heim for the bug report and fix
[ Ian Kelling ]
* fai-guide.txt: document improvements
* fai-cd.8: document improvements
* README.build-sources: small build docs fix
* fai-cd: fix wrong variable name, Closes: #860229
and the debdiff
diff -Nru fai-5.3.5/bin/fai-cd fai-5.3.6/bin/fai-cd
--- fai-5.3.5/bin/fai-cd 2017-01-16 13:22:45.000000000 +0100
+++ fai-5.3.6/bin/fai-cd 2017-04-20 11:06:04.000000000 +0200
@@ -288,7 +288,7 @@
umount $target/$d 2>/dev/null
fi
else
- if [ -d $nfsrootdir/$d ]; then
+ if [ -d $ONFSROOT/$d ]; then
[ "$debug" ] && echo "disclosing $d"
umount $ONFSROOT/$d 2>/dev/null
fi
diff -Nru fai-5.3.5/bin/install_packages fai-5.3.6/bin/install_packages
--- fai-5.3.5/bin/install_packages 2017-02-26 17:36:10.000000000 +0100
+++ fai-5.3.6/bin/install_packages 2017-04-20 05:20:01.000000000 +0200
@@ -544,7 +544,7 @@
# remove :arch from package name
if ( $pack =~ s/:\S+//) {
- insert($n, $pack, 1, "$n using $pack found") && next;
+ insert_pkg($n, $pack, 1, "$n using $pack found") && next;
}
# else package is unknown
diff -Nru fai-5.3.5/debian/changelog fai-5.3.6/debian/changelog
--- fai-5.3.5/debian/changelog 2017-03-22 20:17:17.000000000 +0100
+++ fai-5.3.6/debian/changelog 2017-04-20 12:40:03.000000000 +0200
@@ -1,3 +1,17 @@
+fai (5.3.6) unstable; urgency=low
+
+ [ Thomas Lange ]
+ * install_packages: fix subroutine name, Closes: #860783
+ thanks to John Heim for the bug report and fix
+
+ [ Ian Kelling ]
+ * fai-guide.txt: document improvements
+ * fai-cd.8: document improvements
+ * README.build-sources: small build docs fix
+ * fai-cd: fix wrong variable name, Closes: #860229
+
+ -- Thomas Lange <la...@debian.org> Thu, 20 Apr 2017 10:40:03 +0000
+
fai (5.3.5) unstable; urgency=low
[ Manuel Hachtkemper ]
diff -Nru fai-5.3.5/doc/fai-guide.txt fai-5.3.6/doc/fai-guide.txt
--- fai-5.3.5/doc/fai-guide.txt 2017-02-26 17:26:24.000000000 +0100
+++ fai-5.3.6/doc/fai-guide.txt 2017-04-20 05:43:32.000000000 +0200
@@ -1752,23 +1752,25 @@
=== [[nonfs]]FAI without NFS
To boot into FAI and begin the installation sequence
-without using the NFS protocol. You boot the client machine using PXE as
+without using the NFS protocol, you boot the client machine using PXE as
usual and then retrieve an image containing the nfsroot via http.
-To create an image, use fai-cd's -S argument
+To create an image, use fai-cd's -S argument and -M to avoid setting up
+a partial mirror within the image.
----
-faiserver# fai-cd -S squash.img
+faiserver# fai-cd -M -S squash.img
----
Move this image to a directory from which it can be requested via http
(usually a directory served by the webserver)
To now request the squashfs image, add the following to your kernel
-command line, e.g. in your pxelinux configuration file for the client.
+command line, e.g. in your pxelinux configuration file for the client
+with fai-chboot.
----
-root=live:http://faiserver/cskoeln/squash.img
+root=live:http://faiserver/cskoeln/squash.img
FAI_CONFIG_SRC=file:///var/lib/fai/config
----
Replace faiserver with the domain name or IP of the machine your
diff -Nru fai-5.3.5/man/fai-cd.8 fai-5.3.6/man/fai-cd.8
--- fai-5.3.5/man/fai-cd.8 2017-01-04 21:18:01.000000000 +0100
+++ fai-5.3.6/man/fai-cd.8 2017-04-20 05:43:32.000000000 +0200
@@ -53,7 +53,7 @@
This command creates a bootable ISO CD-ROM image that performs the
fully automatic installation from CD-ROM without an install server. The
ISO image will be written to FILE. To create the image, the
-command needs the NFSROOT, the configuration space and a partial
+command needs the NFSROOT, the configuration space and optionally a partial
mirror, which is created by fai-mirror. The ISO image will contain a compressed
squashfs filesystem. This hybrid CD image can also
be written to an USB stick using dd(1).
@@ -82,10 +82,12 @@
also set the environment variable FAI_ETC_DIR.
.TP
.BI "\-d " URL
-Set the location of the config space to URL (this sets
-FAI_CONFIG_SRC). Set it to "" to create an ISO image without a config space.
If not set, the
-value of FAI_CONFIGDIR will be used. Currently no file: is allowed
-here, instead set FAI_CONFIGDIR in fai.conf(5).
+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
+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
+FAI_CONFIGDIR and copied to /var/lib/fai/config in the image. Currently
+no file: is allowed here, instead set FAI_CONFIGDIR in fai.conf(5).
.TP
.BI \-e
Exclude the directory /var/tmp from the nfsroot. You may put the
@@ -113,15 +115,19 @@
Use xz compression when calling mksquashfs. Default is gzip.
.TP
.BI "\-M "
-Do not add the package mirror to the CD.
+Do not add the package mirror to the CD. Packages that would be fetched
+from the mirror are obtained from the normal sources configured
+elsewhere, usually remote repositories.
.TP
.BI "\-m " DIRECTORY
Use DIRECTORY as partial FAI mirror. This option is mandatory, unless
you use -M or -B.
.TP
.BI \-S
-Create a squashfs image file, instead of a complete iso. This image
-file can be used to fetch the nfsroot through various ways over the network.
+Create a squashfs image file instead of a complete iso. The image
+contains the nfsroot and can be fetched through various ways over the
+network. For an example, see the section "FAI without NFS" in the FAI
+Guide.
.SH EXAMPLES
.br
After you've created a mirror with fai-mirror in /media/mirror, you
diff -Nru fai-5.3.5/README.build-sources fai-5.3.6/README.build-sources
--- fai-5.3.5/README.build-sources 2012-01-18 16:32:12.000000000 +0100
+++ fai-5.3.6/README.build-sources 2017-04-20 05:39:35.000000000 +0200
@@ -3,7 +3,7 @@
# build the packages
cd fai
-git-buildpackage
+gbp buildpackage
or
dpkg-buildpackage -I.git -rfakeroot -uc -us
