diffstat for live-build-4.0.3 live-build-4.0.3

 changelog                                                               |   20 
 control                                                                 |    2 
 gbp.conf                                                                |    2 
 patches/0001-minor-nitpick.patch                                        |   21 
 patches/0002-add-sysvinit-core-if-LB_INITSYSTEM-sysvinit.patch          |   21 
 patches/0003-New-option-use-original-packages-list-LB_BINARY_USE_.patch | 2194 ++++++++++
 patches/0004-Devuan-specific-changes-to-defaults-and-configuratio.patch |  219 
 patches/0005-Use-the-debootstrap-exclude-option-if-LB_INITSYSTEM-.patch |   79 
 patches/0006-Devuan-specific-modified-.udeb-package-path.patch          |   51 
 patches/0007-Devuan-specific-write-cdrom-.disk-base_exclude.patch       |   29 
 patches/0008-Workaround-to-find-firmware-packages.patch                 |   99 
 patches/0009-Slightly-hacky-workarounds-for-when-Packages-is-unav.patch |   48 
 patches/0010-merge-with-prev-patch.patch                                |   26 
 patches/0011-Patch-so-that-chroot_dpkg-works-even-if-setenforce-1.patch |   22 
 patches/0012-mksquashfs_xbcj_option.patch                               |   41 
 patches/series                                                          |   12 
 16 files changed, 2885 insertions(+), 1 deletion(-)

diff -Nru live-build-4.0.3/debian/changelog live-build-4.0.3/debian/changelog
--- live-build-4.0.3/debian/changelog	2014-10-25 12:40:09.000000000 +0000
+++ live-build-4.0.3/debian/changelog	2016-02-06 09:45:27.000000000 +0000
@@ -1,3 +1,23 @@
+live-build (4.0.3-1+devuan2) UNRELEASED; urgency=medium
+
+  [ Ozi Traveller <ozitraveller@gmail.com> ]
+  * Added -Xbcj <architecture> option to mksquashfs in order to compress
+    the filesystem better for that specific architecture.
+
+ -- Frits Daalmans <frits@daalmansdata.eu>  Sat, 06 Feb 2016 10:26:27 +0100
+
+live-build (4.0.3-1+devuan1) UNRELEASED; urgency=medium
+
+  * set debian-branch to devuan/jessie for this branch
+  * Branch of live-build 4.0.3 adapted for Devuan
+  * New option --use-original-packages-list
+  * Use the debootstrap --exclude option
+  * Pass debootstrap --exclude option to CDROM base_exclude
+  * Workaround to find firmware packages
+  * Workaround for when Packages is not found
+
+ -- Frits Daalmans <frits@daalmansdata.eu>  Mon, 28 Dec 2015 16:34:22 +0100
+
 live-build (4.0.3-1) unstable; urgency=low
 
   [ Richard Nelson ]
diff -Nru live-build-4.0.3/debian/control live-build-4.0.3/debian/control
--- live-build-4.0.3/debian/control	2014-10-25 12:40:09.000000000 +0000
+++ live-build-4.0.3/debian/control	2016-02-06 09:45:27.000000000 +0000
@@ -1,7 +1,7 @@
 Source: live-build
 Section: misc
 Priority: optional
-Maintainer: Live Systems Maintainers <debian-live@lists.debian.org>
+Maintainer: Frits Daalmans <frits@daalmansdata.eu>
 Uploaders: Daniel Baumann <mail@daniel-baumann.ch>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.6
diff -Nru live-build-4.0.3/debian/gbp.conf live-build-4.0.3/debian/gbp.conf
--- live-build-4.0.3/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/gbp.conf	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,2 @@
+[buildpackage]
+debian-branch=suites/jessie
diff -Nru live-build-4.0.3/debian/patches/0001-minor-nitpick.patch live-build-4.0.3/debian/patches/0001-minor-nitpick.patch
--- live-build-4.0.3/debian/patches/0001-minor-nitpick.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/0001-minor-nitpick.patch	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,21 @@
+From: Frits Daalmans <frits@daalmansdata.eu>
+Date: Mon, 28 Dec 2015 15:22:10 +0100
+Subject: minor nitpick
+
+---
+ scripts/build/installer_debian-installer | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
+index 6415fff..54c7e91 100755
+--- a/scripts/build/installer_debian-installer
++++ b/scripts/build/installer_debian-installer
+@@ -682,6 +682,8 @@ then
+ 
+ 	while read EXCLUDE
+ 	do
++		if [ "${EXCLUDE}" = "" ]; then continue; fi
++
+ 		if [ "${LB_DEBIAN_INSTALLER}" = "live" ] && [ "${EXCLUDE}" = "live-installer" ]
+ 		then
+ 			continue
diff -Nru live-build-4.0.3/debian/patches/0002-add-sysvinit-core-if-LB_INITSYSTEM-sysvinit.patch live-build-4.0.3/debian/patches/0002-add-sysvinit-core-if-LB_INITSYSTEM-sysvinit.patch
--- live-build-4.0.3/debian/patches/0002-add-sysvinit-core-if-LB_INITSYSTEM-sysvinit.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/0002-add-sysvinit-core-if-LB_INITSYSTEM-sysvinit.patch	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,21 @@
+From: Frits Daalmans <frits@daalmansdata.eu>
+Date: Mon, 28 Dec 2015 15:24:03 +0100
+Subject: add sysvinit-core if LB_INITSYSTEM == sysvinit
+
+---
+ scripts/build/chroot_live-packages | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/build/chroot_live-packages b/scripts/build/chroot_live-packages
+index 603dc0e..4f4ed23 100755
+--- a/scripts/build/chroot_live-packages
++++ b/scripts/build/chroot_live-packages
+@@ -60,7 +60,7 @@ case "${LB_INITSYSTEM}" in
+ 		;;
+ 
+ 	sysvinit)
+-		_PACKAGES="${_PACKAGES} sysvinit"
++		_PACKAGES="${_PACKAGES} sysvinit-core sysvinit"
+ 
+ 		if [ -e chroot/var/lib/dpkg/info/systemd-sysv.list ]
+ 		then
diff -Nru live-build-4.0.3/debian/patches/0003-New-option-use-original-packages-list-LB_BINARY_USE_.patch live-build-4.0.3/debian/patches/0003-New-option-use-original-packages-list-LB_BINARY_USE_.patch
--- live-build-4.0.3/debian/patches/0003-New-option-use-original-packages-list-LB_BINARY_USE_.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/0003-New-option-use-original-packages-list-LB_BINARY_USE_.patch	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,2194 @@
+From: Frits Daalmans <frits@daalmansdata.eu>
+Date: Mon, 28 Dec 2015 15:27:08 +0100
+Subject: New option --use-original-packages-list
+ (LB_BINARY_USE_ORIGINAL_PACKAGES_LIST) If true,
+ copies the original Packages file of the entire distribution to the DVD image,
+ instead of generating a local Packages list.
+
+---
+ manpages/en/lb_config.1            |   4 +
+ manpages/pot/lb_config.1.pot       | 504 +++++++++++++++++++------------------
+ scripts/build/binary_package-lists | 181 ++++++++++++-
+ scripts/build/config               |  11 +
+ 4 files changed, 450 insertions(+), 250 deletions(-)
+
+diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
+index 3cb8c6b..640b321 100644
+--- a/manpages/en/lb_config.1
++++ b/manpages/en/lb_config.1
+@@ -215,6 +215,8 @@
+ .br
+ 	[\fB\-\-updates\fR true|false]
+ .br
++	[\fB\-\-use-original-packages-list\fR true|false]
++.br
+ 	[\fB\-\-backports\fR true|false]
+ .br
+ 	[\fB\-\-verbose\fR]
+@@ -450,6 +452,8 @@ sets the path to the templates that live\-build is going to use, e.g. for bootlo
+ defines what size the hdd image should be. Note that although the default is set to 10000 (= 10GB), it will not need 10GB space on your harddisk as the files are created as sparse files.
+ .IP "\fB\-\-updates\fR true|false" 4
+ defines if debian updates package archives should be included in the image or not.
++.IP "\fB\-\-use-original-packages-list\fR true|false" 4
++defines if a local Packages list is generated for the image, or if the original Packages file of the entire distribution is copied to the image.
+ .IP "\fB\-\-backports\fR true|false" 4
+ defines if debian backports package archives should be included in the image or not.
+ .IP "\fB\-\-verbose\fR" 4
+diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
+index 2a67ae2..91acb59 100644
+--- a/manpages/pot/lb_config.1.pot
++++ b/manpages/pot/lb_config.1.pot
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: live-build 4.0.3-1\n"
+-"POT-Creation-Date: 2014-10-25 14:34+0200\n"
++"POT-Creation-Date: 2015-10-21 01:43+0000\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL@li.org>\n"
+@@ -66,7 +66,7 @@ msgstr ""
+ 
+ #. type: SH
+ #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
+-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:225 en/lb_source.1:9
++#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:227 en/lb_source.1:9
+ #: en/live-build.7:11
+ #, no-wrap
+ msgid "DESCRIPTION"
+@@ -74,7 +74,7 @@ msgstr ""
+ 
+ #. type: SH
+ #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
+-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:234 en/lb_source.1:14
++#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:236 en/lb_source.1:14
+ #: en/live-build.7:20
+ #, no-wrap
+ msgid "OPTIONS"
+@@ -82,7 +82,7 @@ msgstr ""
+ 
+ #. type: SH
+ #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
+-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:466 en/lb_source.1:17
++#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:470 en/lb_source.1:17
+ #: en/live-build.7:215
+ #, no-wrap
+ msgid "FILES"
+@@ -90,7 +90,7 @@ msgstr ""
+ 
+ #. type: SH
+ #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
+-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:473 en/lb_source.1:20
++#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:477 en/lb_source.1:20
+ #: en/live-build.7:219
+ #, no-wrap
+ msgid "SEE ALSO"
+@@ -98,20 +98,20 @@ msgstr ""
+ 
+ #. type: Plain text
+ #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
+-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:475 en/lb_source.1:22
++#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:479 en/lb_source.1:22
+ msgid "I<live-build>(7)"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
+-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:481 en/lb_source.1:24
++#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:485 en/lb_source.1:24
+ #: en/live-build.7:225
+ msgid "This program is a part of live-build."
+ msgstr ""
+ 
+ #. type: SH
+ #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
+-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:482 en/lb_source.1:25
++#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:486 en/lb_source.1:25
+ #: en/live-build.7:226
+ #, no-wrap
+ msgid "HOMEPAGE"
+@@ -119,7 +119,7 @@ msgstr ""
+ 
+ #. type: Plain text
+ #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
+-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:484 en/lb_source.1:27
++#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:488 en/lb_source.1:27
+ #: en/live-build.7:228
+ msgid ""
+ "More information about live-build and the Live Systems project can be found "
+@@ -129,7 +129,7 @@ msgstr ""
+ 
+ #. type: SH
+ #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
+-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:485 en/lb_source.1:28
++#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:489 en/lb_source.1:28
+ #: en/live-build.7:229
+ #, no-wrap
+ msgid "BUGS"
+@@ -137,7 +137,7 @@ msgstr ""
+ 
+ #. type: Plain text
+ #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
+-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:487 en/lb_source.1:30
++#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:491 en/lb_source.1:30
+ #: en/live-build.7:231
+ msgid ""
+ "Bugs can be reported by submitting a bugreport for the live-build package in "
+@@ -148,7 +148,7 @@ msgstr ""
+ 
+ #. type: SH
+ #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
+-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:488 en/lb_source.1:31
++#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:492 en/lb_source.1:31
+ #: en/live-build.7:232
+ #, no-wrap
+ msgid "AUTHOR"
+@@ -156,7 +156,7 @@ msgstr ""
+ 
+ #. type: Plain text
+ #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
+-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:489 en/lb_source.1:32
++#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:493 en/lb_source.1:32
+ #: en/live-build.7:233
+ msgid ""
+ "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
+@@ -698,22 +698,27 @@ msgstr ""
+ 
+ #. type: Plain text
+ #: en/lb_config.1:219
+-msgid "  [B<--backports> true|false]"
++msgid "  [B<--use-original-packages-list> true|false]"
+ msgstr ""
+ 
+ #. type: Plain text
+ #: en/lb_config.1:221
++msgid "  [B<--backports> true|false]"
++msgstr ""
++
++#. type: Plain text
++#: en/lb_config.1:223
+ msgid "  [B<--verbose>]"
+ msgstr ""
+ 
+ #.  FIXME
+ #. type: Plain text
+-#: en/lb_config.1:224
++#: en/lb_config.1:226
+ msgid "  [B<--win32-loader true|false]>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:227
++#: en/lb_config.1:229
+ msgid ""
+ "B<lb config> is a high-level command (porcelain) of I<live-build>(7), the "
+ "live systems tool suite."
+@@ -721,7 +726,7 @@ msgstr ""
+ 
+ #.  FIXME
+ #. type: Plain text
+-#: en/lb_config.1:230
++#: en/lb_config.1:232
+ msgid ""
+ "B<lb config> populates the configuration directory for live-build. By "
+ "default, this directory is named 'config' and is created in the current "
+@@ -730,7 +735,7 @@ msgstr ""
+ 
+ #.  FIXME
+ #. type: Plain text
+-#: en/lb_config.1:233
++#: en/lb_config.1:235
+ msgid ""
+ "Note: Currently B<lb config> tries to be smart and sets defaults for some "
+ "options depending on the setting of other options (e.g. which linux packages "
+@@ -746,7 +751,7 @@ msgid ""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:236
++#: en/lb_config.1:238
+ msgid ""
+ "In addition to its specific options B<lb config> understands all generic "
+ "live-build options. See I<live-build>(7) for a complete list of all generic "
+@@ -755,26 +760,26 @@ msgstr ""
+ 
+ #.  FIXME
+ #. type: IP
+-#: en/lb_config.1:238
++#: en/lb_config.1:240
+ #, no-wrap
+ msgid "B<--apt> apt|aptitude"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:240
++#: en/lb_config.1:242
+ msgid ""
+ "defines if apt-get or aptitude is used to install packages when building the "
+ "image. The default is apt."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:240
++#: en/lb_config.1:242
+ #, no-wrap
+ msgid "B<--apt-ftp-proxy> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:242
++#: en/lb_config.1:244
+ msgid ""
+ "sets the ftp proxy to be used by apt. By default, this is empty. Note that "
+ "this variable is only for the proxy that gets used by apt internally within "
+@@ -782,13 +787,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:242
++#: en/lb_config.1:244
+ #, no-wrap
+ msgid "B<--apt-http-proxy> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:244
++#: en/lb_config.1:246
+ msgid ""
+ "sets the http proxy to be used by apt. By default, this is empty. Note that "
+ "this variable is only for the proxy that gets used by apt internally within "
+@@ -796,26 +801,26 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:244
++#: en/lb_config.1:246
+ #, no-wrap
+ msgid "B<--apt-indices> true|false|none"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:246
++#: en/lb_config.1:248
+ msgid ""
+ "defines if the resulting images should have apt indices or not and defaults "
+ "to true. If set to none, no indices are included at all."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:246
++#: en/lb_config.1:248
+ #, no-wrap
+ msgid "B<--apt-options> I<OPTION>|\"I<OPTIONS>\""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:248
++#: en/lb_config.1:250
+ msgid ""
+ "defines the default options that will be appended to every apt call that is "
+ "made inside chroot during the building of the image. By default, this is set "
+@@ -823,13 +828,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:248
++#: en/lb_config.1:250
+ #, no-wrap
+ msgid "B<--aptitude-options> I<OPTION>|\"I<OPTIONS>\""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:250
++#: en/lb_config.1:252
+ msgid ""
+ "defines the default options that will be appended to every aptitude call "
+ "that is made inside chroot during building of the image. By default, this is "
+@@ -837,13 +842,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:250
++#: en/lb_config.1:252
+ #, no-wrap
+ msgid "B<--apt-pipeline> I<DEPTH>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:252
++#: en/lb_config.1:254
+ msgid ""
+ "sets the depth of the apt/aptitude pipeline. In cases where the remote "
+ "server is not RFC conforming or buggy (such as Squid 2.0.2) this option can "
+@@ -855,51 +860,51 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:252
++#: en/lb_config.1:254
+ #, no-wrap
+ msgid "B<--apt-recommends> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:254
++#: en/lb_config.1:256
+ msgid ""
+ "defines if apt should install recommended packages automatically. By "
+ "default, this is true."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:254
++#: en/lb_config.1:256
+ #, no-wrap
+ msgid "B<--apt-secure> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:256
++#: en/lb_config.1:258
+ msgid ""
+ "defines if apt should check repository signatures. This is true by default."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:256
++#: en/lb_config.1:258
+ #, no-wrap
+ msgid "B<--apt-source-archives> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:258
++#: en/lb_config.1:260
+ msgid ""
+ "defines if deb-src entries should be included in the resulting live image or "
+ "not, defaults to true."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:258
++#: en/lb_config.1:260
+ #, no-wrap
+ msgid "-a|B<--architectures> I<ARCHITECTURE>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:260
++#: en/lb_config.1:262
+ msgid ""
+ "defines the architecture of the to be build image. By default, this is set "
+ "to the host architecture. Note that you cannot crossbuild for another "
+@@ -910,13 +915,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:260
++#: en/lb_config.1:262
+ #, no-wrap
+ msgid "-b|B<--binary-images> iso|iso-hybrid|netboot|tar|hdd"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:262
++#: en/lb_config.1:264
+ msgid ""
+ "defines the image type to build. By default, for images using syslinux this "
+ "is set to iso-hybrid to build CD/DVD images that may also be used like hdd "
+@@ -924,13 +929,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:262
++#: en/lb_config.1:264
+ #, no-wrap
+ msgid "B<--binary-filesystem> fat16|fat32|ext2|ext3|ext4"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:264
++#: en/lb_config.1:266
+ msgid ""
+ "defines the filesystem to be used in the image type. This only has an effect "
+ "if the selected binary image type does allow to choose a filesystem. For "
+@@ -943,24 +948,24 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:264
++#: en/lb_config.1:266
+ #, no-wrap
+ msgid "B<--bootappend-install> I<PARAMETER>|\"I<PARAMETERS>\""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:266
++#: en/lb_config.1:268
+ msgid "sets boot parameters specific to debian-installer, if included."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:266
++#: en/lb_config.1:268
+ #, no-wrap
+ msgid "B<--bootappend-live> I<PARAMETER>|\"I<PARAMETERS>\""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:268
++#: en/lb_config.1:270
+ msgid ""
+ "sets boot parameters specific to debian-live. A complete list of boot "
+ "parameters can be found in the I<live-boot>(7) and I<live-config>(7) manual "
+@@ -968,13 +973,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:268
++#: en/lb_config.1:270
+ #, no-wrap
+ msgid "B<--bootloader> grub|syslinux"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:270
++#: en/lb_config.1:272
+ msgid ""
+ "defines which bootloader is being used in the generated image. This has only "
+ "an effect if the selected binary image type does allow to choose the "
+@@ -987,39 +992,39 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:270
++#: en/lb_config.1:272
+ #, no-wrap
+ msgid "B<--bootstrap> cdebootstrap|cdebootstrap-static|debootstrap"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:272
++#: en/lb_config.1:274
+ msgid ""
+ "defines which program is used to bootstrap the debian chroot, default is "
+ "debootstrap."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:272
++#: en/lb_config.1:274
+ #, no-wrap
+ msgid "B<--cache> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:274
++#: en/lb_config.1:276
+ msgid ""
+ "defines globally if any cache should be used at all. Different caches can be "
+ "controlled through the their own options."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:274
++#: en/lb_config.1:276
+ #, no-wrap
+ msgid "B<--cache-indices> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:276
++#: en/lb_config.1:278
+ msgid ""
+ "defines if downloaded package indices and lists should be cached which is "
+ "false by default. Enabling it would allow to rebuild an image completely "
+@@ -1027,13 +1032,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:276
++#: en/lb_config.1:278
+ #, no-wrap
+ msgid "B<--cache-packages> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:278
++#: en/lb_config.1:280
+ msgid ""
+ "defines if downloaded packages files should be cached which is true by "
+ "default. Disabling it does save space consumption in your build directory, "
+@@ -1044,13 +1049,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:278
++#: en/lb_config.1:280
+ #, no-wrap
+ msgid "B<--cache-stages> true|false|I<STAGE>|\"I<STAGES>\""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:280
++#: en/lb_config.1:282
+ msgid ""
+ "sets which stages should be cached. By default set to bootstrap. As an "
+ "exception to the normal stage names, also rootfs can be used here which does "
+@@ -1060,13 +1065,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:280
++#: en/lb_config.1:282
+ #, no-wrap
+ msgid "B<--checksums> md5|sha1|sha256|none"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:282
++#: en/lb_config.1:284
+ msgid ""
+ "defines if the binary image should contain a file called md5sums.txt, "
+ "sha1sums.txt and/or sha256sums.txt. These lists all files on the image "
+@@ -1078,39 +1083,39 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:282
++#: en/lb_config.1:284
+ #, no-wrap
+ msgid "B<--compression> bzip2|gzip|lzip|none"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:284
++#: en/lb_config.1:286
+ msgid ""
+ "defines the compression program to be used to compress tarballs. Defaults to "
+ "gzip."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:284
++#: en/lb_config.1:286
+ #, no-wrap
+ msgid "B<--config> I<GIT_URL>::I<GIT_ID>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:286
++#: en/lb_config.1:288
+ msgid ""
+ "allows to bootstrap a config tree from a git repositories, optionally "
+ "appended by a Git Id (branch, commit, tag, etc.)."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:286
++#: en/lb_config.1:288
+ #, no-wrap
+ msgid "B<--build-with-chroot> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:288
++#: en/lb_config.1:290
+ msgid ""
+ "defines whether live-build should use the tools from within the chroot to "
+ "build the binary image or not by using and including the host system's "
+@@ -1125,13 +1130,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:288
++#: en/lb_config.1:290
+ #, no-wrap
+ msgid "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:290
++#: en/lb_config.1:292
+ msgid ""
+ "defines which filesystem type should be used for the root filesystem image. "
+ "If you use none, then no filesystem image is created and the root filesystem "
+@@ -1142,39 +1147,39 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:290
++#: en/lb_config.1:292
+ #, no-wrap
+ msgid "B<--clean>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:292
++#: en/lb_config.1:294
+ msgid ""
+ "minimizes config directory by automatically removing unused and thus empty "
+ "subdirectories."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:292
++#: en/lb_config.1:294
+ #, no-wrap
+ msgid "-c|B<--conffile> I<FILE>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:294
++#: en/lb_config.1:296
+ msgid ""
+ "using a user specified alternative configuration file in addition to the "
+ "normally used one in the config directory."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:294
++#: en/lb_config.1:296
+ #, no-wrap
+ msgid "B<--debconf-frontend> dialog|editor|noninteractive|readline"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:296
++#: en/lb_config.1:298
+ msgid ""
+ "defines what value the debconf frontend should be set to inside the chroot. "
+ "Note that setting it to anything but noninteractive, which is the default, "
+@@ -1182,13 +1187,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:296
++#: en/lb_config.1:298
+ #, no-wrap
+ msgid "B<--debconf-priority> low|medium|high|critical"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:298
++#: en/lb_config.1:300
+ msgid ""
+ "defines what value the debconf priority should be set to inside the chroot. "
+ "By default, it is set to critical, which means that almost no questions are "
+@@ -1197,13 +1202,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:298
++#: en/lb_config.1:300
+ #, no-wrap
+ msgid "B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:300
++#: en/lb_config.1:302
+ msgid ""
+ "defines which type, if any, of the debian-installer should be included in "
+ "the resulting binary image. By default, no installer is included. All "
+@@ -1215,13 +1220,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:300
++#: en/lb_config.1:302
+ #, no-wrap
+ msgid "B<--debian-installer-distribution> daily|I<CODENAME>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:302
++#: en/lb_config.1:304
+ msgid ""
+ "defines the distribution where the debian-installer files should be taken "
+ "out from. Normally, this should be set to the same distribution as the live "
+@@ -1230,13 +1235,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:302
++#: en/lb_config.1:304
+ #, no-wrap
+ msgid "B<--debian-installer-preseedfile> I<FILE>|I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:304
++#: en/lb_config.1:306
+ msgid ""
+ "sets the filename or URL for an optionally used and included preseeding file "
+ "for debian-installer. If config/binary_debian-installer/preseed.cfg exists, "
+@@ -1244,13 +1249,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:304
++#: en/lb_config.1:306
+ #, no-wrap
+ msgid "B<--debian-installer-gui> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:306
++#: en/lb_config.1:308
+ msgid ""
+ "defines if the debian-installer graphical GTK interface should be true or "
+ "not. In Debian mode and for most versions of Ubuntu, this option is true, "
+@@ -1258,60 +1263,60 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:306 en/live-build.7:36
++#: en/lb_config.1:308 en/live-build.7:36
+ #, no-wrap
+ msgid "B<--debug>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:308
++#: en/lb_config.1:310
+ msgid "turn on debugging informational messages."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:308
++#: en/lb_config.1:310
+ #, no-wrap
+ msgid "-d|B<--distribution> I<CODENAME>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:310
++#: en/lb_config.1:312
+ msgid "defines the distribution of the resulting live system."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:310
++#: en/lb_config.1:312
+ #, no-wrap
+ msgid "-d|B<--parent-distribution> I<CODENAME>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:312
++#: en/lb_config.1:314
+ msgid ""
+ "defines the parent distribution for derivatives of the resulting live system."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:312
++#: en/lb_config.1:314
+ #, no-wrap
+ msgid "-d|B<--parent-debian-installer-distribution> I<CODENAME>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:314
++#: en/lb_config.1:316
+ msgid ""
+ "defines the parent debian-installer distribution for derivatives of the "
+ "resulting live system."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:314
++#: en/lb_config.1:316
+ #, no-wrap
+ msgid "B<--dump>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:316
++#: en/lb_config.1:318
+ msgid ""
+ "prepares a report of the currently present live system configuration and the "
+ "version of live-build used. This is useful to provide if you submit bug "
+@@ -1320,26 +1325,26 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:316
++#: en/lb_config.1:318
+ #, no-wrap
+ msgid "B<--fdisk> fdisk|fdisk.dist"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:318
++#: en/lb_config.1:320
+ msgid ""
+ "sets the filename of the fdisk binary from the host system that should be "
+ "used. This is autodetected and does generally not need any customization."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:318 en/live-build.7:38
++#: en/lb_config.1:320 en/live-build.7:38
+ #, no-wrap
+ msgid "B<--force>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:320
++#: en/lb_config.1:322
+ msgid ""
+ "forces re-execution of already run stages. Use only if you know what you are "
+ "doing. It is generally safer to use B<lb clean> to clean up before re-"
+@@ -1347,26 +1352,26 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:320
++#: en/lb_config.1:322
+ #, no-wrap
+ msgid "B<--grub-splash> I<FILE>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:322
++#: en/lb_config.1:324
+ msgid ""
+ "defines the name of an optional to be included splash screen graphic for the "
+ "grub bootloader."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:322
++#: en/lb_config.1:324
+ #, no-wrap
+ msgid "B<--gzip-options> I<OPTION>|\"I<OPTIONS>\""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:324
++#: en/lb_config.1:326
+ msgid ""
+ "defines the default options that will be appended to (almost) every gzip "
+ "call during the building of the image. By default, this is set to --best to "
+@@ -1375,13 +1380,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:324
++#: en/lb_config.1:326
+ #, no-wrap
+ msgid "B<--hooks> I<FILE>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:326
++#: en/lb_config.1:328
+ msgid ""
+ "defines which hooks available in /usr/share/live/build/examples/hooks should "
+ "be activated. Normally, there are no hooks executed. Make sure you know and "
+@@ -1389,13 +1394,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:326
++#: en/lb_config.1:328
+ #, no-wrap
+ msgid "B<--ignore-system-defaults>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:328
++#: en/lb_config.1:330
+ msgid ""
+ "B<lb config> by default reads system defaults from I</etc/live/build.conf> "
+ "and I</etc/live/build/*> when generating a new live system config directory. "
+@@ -1404,13 +1409,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:328
++#: en/lb_config.1:330
+ #, no-wrap
+ msgid "B<--initramfs> auto|none|live-boot|casper"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:330
++#: en/lb_config.1:332
+ msgid ""
+ "sets the name of package that contains the live system specific initramfs "
+ "modification. By default, auto is used, which means that at build time of "
+@@ -1421,26 +1426,26 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:330
++#: en/lb_config.1:332
+ #, no-wrap
+ msgid "B<--initramfs-compression> bzip2|gzip|lzma]"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:332
++#: en/lb_config.1:334
+ msgid ""
+ "defines the compression program to be used to compress the initramfs. "
+ "Defaults to gzip."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:332
++#: en/lb_config.1:334
+ #, no-wrap
+ msgid "B<--interactive> shell"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:334
++#: en/lb_config.1:336
+ msgid ""
+ "defines if after the chroot stage and before the beginning of the binary "
+ "stage, a interactive shell login should be spawned in the chroot in order to "
+@@ -1454,24 +1459,24 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:334
++#: en/lb_config.1:336
+ #, no-wrap
+ msgid "B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:336
++#: en/lb_config.1:338
+ msgid "defines options to pass to isohybrid."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:336
++#: en/lb_config.1:338
+ #, no-wrap
+ msgid "B<--iso-application> I<NAME>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:338
++#: en/lb_config.1:340
+ msgid ""
+ "sets the APPLICATION field in the header of a resulting CD/DVD image and "
+ "defaults to \"Debian Live\" in debian mode, and \"Ubuntu Live\" in ubuntu "
+@@ -1479,13 +1484,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:338
++#: en/lb_config.1:340
+ #, no-wrap
+ msgid "B<--iso-preparer> I<NAME>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:340
++#: en/lb_config.1:342
+ msgid ""
+ "sets the PREPARER field in the header of a resulting CD/DVD image. By "
+ "default this is set to \"live-build I<VERSION>; http://packages.qa.debian."
+@@ -1494,13 +1499,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:340
++#: en/lb_config.1:342
+ #, no-wrap
+ msgid "B<--iso-publisher> I<NAME>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:342
++#: en/lb_config.1:344
+ msgid ""
+ "sets the PUBLISHED field in the header of a resulting CD/DVD image. By "
+ "default, this is set to 'Live Systems project; http:/live-systems.org/; "
+@@ -1509,13 +1514,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:342
++#: en/lb_config.1:344
+ #, no-wrap
+ msgid "B<--iso-volume> I<NAME>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:344
++#: en/lb_config.1:346
+ msgid ""
+ "sets the VOLUME field in the header of a resulting CD/DVD and defaults to "
+ "'(I<MODE>) (I<DISTRIBUTION>) (I<DATE>)' whereas MODE is expanded to the name "
+@@ -1524,13 +1529,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:344
++#: en/lb_config.1:346
+ #, no-wrap
+ msgid "B<--jffs2-eraseblock> I<SIZE>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:346
++#: en/lb_config.1:348
+ msgid ""
+ "sets the eraseblock size for a JFFS2 (Second Journaling Flash File System) "
+ "filesystem. The default is 64 KiB. If you use an erase block size different "
+@@ -1540,39 +1545,39 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:346
++#: en/lb_config.1:348
+ #, no-wrap
+ msgid "B<--keyring-packages> I<PACKAGE|\"PACKAGES>\""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:348
++#: en/lb_config.1:350
+ msgid ""
+ "sets the keyring package or additional keyring packages. By default this is "
+ "set to debian-archive-keyring."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:348
++#: en/lb_config.1:350
+ #, no-wrap
+ msgid "-k|B<--linux-flavours> I<FLAVOUR>|\"I<FLAVOURS>\""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:350
++#: en/lb_config.1:352
+ msgid ""
+ "sets the kernel flavours to be installed. Note that in case you specify more "
+ "than that the first will be configured the default kernel that gets booted."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:350
++#: en/lb_config.1:352
+ #, no-wrap
+ msgid "B<--linux-packages> \"I<PACKAGES>\""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:352
++#: en/lb_config.1:354
+ msgid ""
+ "sets the internal name of the kernel packages naming scheme. If you use "
+ "debian kernel packages, you will not have to adjust it. If you decide to use "
+@@ -1586,26 +1591,26 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:352
++#: en/lb_config.1:354
+ #, no-wrap
+ msgid "B<--losetup> losetup|losetup.orig"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:354
++#: en/lb_config.1:356
+ msgid ""
+ "sets the filename of the losetup binary from the host system that should be "
+ "used. This is autodetected and does generally not need any customization."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:354
++#: en/lb_config.1:356
+ #, no-wrap
+ msgid "B<--memtest> memtest86+|memtest86|none"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:356
++#: en/lb_config.1:358
+ msgid ""
+ "defines if memtest, memtest86+ or no memory tester at all should be included "
+ "as secondary bootloader configuration. This is only available on amd64 and "
+@@ -1613,13 +1618,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:356
++#: en/lb_config.1:358
+ #, no-wrap
+ msgid "-m|B<--parent-mirror-bootstrap> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:358
++#: en/lb_config.1:360
+ msgid ""
+ "sets the location of the debian package mirror that should be used to "
+ "bootstrap from. This defaults to http://ftp.de.debian.org/debian/ which may "
+@@ -1627,13 +1632,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:358
++#: en/lb_config.1:360
+ #, no-wrap
+ msgid "B<--parent-mirror-chroot> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:360
++#: en/lb_config.1:362
+ msgid ""
+ "sets the location of the debian package mirror that will be used to fetch "
+ "the packages in order to build the live system. By default, this is set to "
+@@ -1641,13 +1646,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:360
++#: en/lb_config.1:362
+ #, no-wrap
+ msgid "B<--parent-mirror-chroot-security> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:362
++#: en/lb_config.1:364
+ msgid ""
+ "sets the location of the debian security package mirror that will be used to "
+ "fetch the packages in order to build the live system. By default, this "
+@@ -1655,13 +1660,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:362
++#: en/lb_config.1:364
+ #, no-wrap
+ msgid "B<--parent-mirror-chroot-updates> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:364
++#: en/lb_config.1:366
+ msgid ""
+ "sets the location of the debian updates package mirror that will be used to "
+ "fetch packages in order to build the live system. By default, this is set to "
+@@ -1669,13 +1674,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:364
++#: en/lb_config.1:366
+ #, no-wrap
+ msgid "B<--parent-mirror-chroot-backports> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:366
++#: en/lb_config.1:368
+ msgid ""
+ "sets the location of the debian backports package mirror that will be used "
+ "to fetch packages in order to build the live system. By default, this points "
+@@ -1683,13 +1688,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:366
++#: en/lb_config.1:368
+ #, no-wrap
+ msgid "B<--parent-mirror-binary> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:368
++#: en/lb_config.1:370
+ msgid ""
+ "sets the location of the debian package mirror that should end up configured "
+ "in the final image and which is the one a user would see and use. This has "
+@@ -1699,13 +1704,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:368
++#: en/lb_config.1:370
+ #, no-wrap
+ msgid "B<--parent-mirror-binary-security> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:370
++#: en/lb_config.1:372
+ msgid ""
+ "sets the location of the debian security package mirror that should end up "
+ "configured in the final image. By default, 'http://security.debian.org/' is "
+@@ -1713,13 +1718,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:370
++#: en/lb_config.1:372
+ #, no-wrap
+ msgid "B<--parent-mirror-binary-updates> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:372
++#: en/lb_config.1:374
+ msgid ""
+ "sets the location of the debian updates package mirror that should end up "
+ "configured in the final image. By default, the value of --parent-mirror-"
+@@ -1727,13 +1732,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:372
++#: en/lb_config.1:374
+ #, no-wrap
+ msgid "B<--parent-mirror-binary-backports> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:374
++#: en/lb_config.1:376
+ msgid ""
+ "sets the location of the debian backports package mirror that should end up "
+ "configured in the final image. By default, 'http://backports.debian.org/"
+@@ -1741,13 +1746,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:374
++#: en/lb_config.1:376
+ #, no-wrap
+ msgid "B<--parent-mirror-debian-installer> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:376
++#: en/lb_config.1:378
+ msgid ""
+ "sets the location of the mirror that will be used to fetch the debian "
+ "installer images. By default, this points to the same mirror used to build "
+@@ -1755,13 +1760,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:376
++#: en/lb_config.1:378
+ #, no-wrap
+ msgid "B<--mirror-bootstrap> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:378
++#: en/lb_config.1:380
+ msgid ""
+ "sets the location of the debian package mirror that should be used to "
+ "bootstrap the derivative from. This defaults to http://ftp.de.debian.org/"
+@@ -1769,13 +1774,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:378
++#: en/lb_config.1:380
+ #, no-wrap
+ msgid "B<--mirror-chroot> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:380
++#: en/lb_config.1:382
+ msgid ""
+ "sets the location of the debian package mirror that will be used to fetch "
+ "the packages of the derivative in order to build the live system. By "
+@@ -1783,13 +1788,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:380
++#: en/lb_config.1:382
+ #, no-wrap
+ msgid "B<--mirror-chroot-security> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:382
++#: en/lb_config.1:384
+ msgid ""
+ "sets the location of the debian security package mirror that will be used to "
+ "fetch the packages of the derivative in order to build the live system. By "
+@@ -1797,13 +1802,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:382
++#: en/lb_config.1:384
+ #, no-wrap
+ msgid "B<--mirror-chroot-updates> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:384
++#: en/lb_config.1:386
+ msgid ""
+ "sets the location of the debian updates package mirror that will be used to "
+ "fetch packages of the derivative in order to build the live system. By "
+@@ -1811,13 +1816,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:384
++#: en/lb_config.1:386
+ #, no-wrap
+ msgid "B<--mirror-chroot-backports> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:386
++#: en/lb_config.1:388
+ msgid ""
+ "sets the location of the debian backports package mirror that will be used "
+ "to fetch packages of the derivative in order to build the live system. By "
+@@ -1825,13 +1830,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:386
++#: en/lb_config.1:388
+ #, no-wrap
+ msgid "B<--mirror-binary> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:388
++#: en/lb_config.1:390
+ msgid ""
+ "sets the location of the derivative package mirror that should end up "
+ "configured in the final image and which is the one a user would see and use. "
+@@ -1841,52 +1846,52 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:388
++#: en/lb_config.1:390
+ #, no-wrap
+ msgid "B<--mirror-binary-security> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:390
++#: en/lb_config.1:392
+ msgid ""
+ "sets the location of the derivatives security package mirror that should end "
+ "up configured in the final image."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:390
++#: en/lb_config.1:392
+ #, no-wrap
+ msgid "B<--mirror-binary-updates> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:392
++#: en/lb_config.1:394
+ msgid ""
+ "sets the location of the derivatives updates package mirror that should end "
+ "up configured in the final image."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:392
++#: en/lb_config.1:394
+ #, no-wrap
+ msgid "B<--mirror-binary-backports> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:394
++#: en/lb_config.1:396
+ msgid ""
+ "sets the location of the derivatives backports package mirror that should "
+ "end up configured in the final image."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:394
++#: en/lb_config.1:396
+ #, no-wrap
+ msgid "B<--mirror-debian-installer> I<URL>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:396
++#: en/lb_config.1:398
+ msgid ""
+ "sets the location of the mirror that will be used to fetch the debian "
+ "installer images of the derivative. By default, this points to the same "
+@@ -1894,65 +1899,65 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:396
++#: en/lb_config.1:398
+ #, no-wrap
+ msgid "B<--mode> debian|progress|ubuntu"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:398
++#: en/lb_config.1:400
+ msgid ""
+ "defines a global mode to load project specific defaults. By default this is "
+ "set to debian."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:398
++#: en/lb_config.1:400
+ #, no-wrap
+ msgid "B<--system> live|normal"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:400
++#: en/lb_config.1:402
+ msgid ""
+ "defines if the resulting system image should a live system or a normal, non-"
+ "live system."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:400
++#: en/lb_config.1:402
+ #, no-wrap
+ msgid "B<--net-root-filesystem> nfs|cfs"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:402
++#: en/lb_config.1:404
+ msgid ""
+ "defines the filesystem that will be configured in the bootloader "
+ "configuration for your netboot image. This defaults to nfs."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:402
++#: en/lb_config.1:404
+ #, no-wrap
+ msgid "B<--net-root-mountoptions> I<OPTIONS>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:404
++#: en/lb_config.1:406
+ msgid ""
+ "sets additional options for mounting the root filesystem in netboot images "
+ "and is by default empty."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:404
++#: en/lb_config.1:406
+ #, no-wrap
+ msgid "B<--net-root-path> I<PATH>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:406
++#: en/lb_config.1:408
+ msgid ""
+ "sets the file path that will be configured in the bootloader configuration "
+ "for your netboot image. This defaults to /srv/debian-live in debian mode, "
+@@ -1960,13 +1965,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:406
++#: en/lb_config.1:408
+ #, no-wrap
+ msgid "B<--net-root-server> I<IP>|I<HOSTNAME>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:408
++#: en/lb_config.1:410
+ msgid ""
+ "sets the IP or hostname that will be configured in the bootloader "
+ "configuration for the root filesystem of your netboot image. This defaults "
+@@ -1974,38 +1979,38 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:408
++#: en/lb_config.1:410
+ #, no-wrap
+ msgid "B<--net-cow-filesystem> nfs|cfs"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:410
++#: en/lb_config.1:412
+ msgid ""
+ "defines the filesystem type for the copy-on-write layer and defaults to nfs."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:410
++#: en/lb_config.1:412
+ #, no-wrap
+ msgid "B<--net-cow-mountoptions> I<OPTIONS>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:412
++#: en/lb_config.1:414
+ msgid ""
+ "sets additional options for mounting the copy-on-write layer in netboot "
+ "images and is by default empty."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:412
++#: en/lb_config.1:414
+ #, no-wrap
+ msgid "B<--net-cow-path> I<PATH>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:414
++#: en/lb_config.1:416
+ msgid ""
+ "defines the path to client writable filesystem. Anywhere that "
+ "I<client_mac_address> is specified in the path live-boot will substitute the "
+@@ -2013,28 +2018,28 @@ msgid ""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:417
++#: en/lb_config.1:419
+ msgid "Example:"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:419
++#: en/lb_config.1:421
+ msgid "/export/hosts/client_mac_address"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:421
++#: en/lb_config.1:423
+ msgid "/export/hosts/00-16-D3-33-92-E8"
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:421
++#: en/lb_config.1:423
+ #, no-wrap
+ msgid "B<--net-cow-server> I<IP>|I<HOSTNAME>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:423
++#: en/lb_config.1:425
+ msgid ""
+ "sets the IP or hostname that will be configured in the bootloader "
+ "configuration for the copy-on-write filesystem of your netboot image and is "
+@@ -2042,13 +2047,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:423
++#: en/lb_config.1:425
+ #, no-wrap
+ msgid "B<--net-tarball> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:425
++#: en/lb_config.1:427
+ msgid ""
+ "defines if a compressed tarball should be created. Disabling this options "
+ "leads to no tarball at all, the plain binary directory is considered the "
+@@ -2056,24 +2061,24 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:425 en/live-build.7:40
++#: en/lb_config.1:427 en/live-build.7:40
+ #, no-wrap
+ msgid "B<--quiet>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:427
++#: en/lb_config.1:429
+ msgid "reduces the verbosity of messages output by B<lb build>."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:427
++#: en/lb_config.1:429
+ #, no-wrap
+ msgid "B<--archive-areas> I<ARCHIVE_AREA>|\"I<ARCHIVE_AREAS>\""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:429
++#: en/lb_config.1:431
+ msgid ""
+ "defines which package archive areas of a debian packages archive should be "
+ "used for configured debian package mirrors. By default, this is set to main. "
+@@ -2083,37 +2088,37 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:429
++#: en/lb_config.1:431
+ #, no-wrap
+ msgid "B<--parent-archive-areas> I<PARENT_ARCHIVE_AREA>|\"I<PARENT_ARCHIVE_AREAS>\""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:431
++#: en/lb_config.1:433
+ msgid "defines the archive areas for derivatives of the resulting live system."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:431
++#: en/lb_config.1:433
+ #, no-wrap
+ msgid "B<--security> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:433
++#: en/lb_config.1:435
+ msgid ""
+ "defines if the security repositories specified in the security mirror "
+ "options should be used or not."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:433
++#: en/lb_config.1:435
+ #, no-wrap
+ msgid "B<--source> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:435
++#: en/lb_config.1:437
+ msgid ""
+ "defines if a corresponding source image to the binary image should be build. "
+ "By default this is false because most people do not require this and would "
+@@ -2123,24 +2128,24 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:435
++#: en/lb_config.1:437
+ #, no-wrap
+ msgid "-s|B<--source-images> iso|netboot|tar|hdd"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:437
++#: en/lb_config.1:439
+ msgid "defines the image type for the source image. Default is tar."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:437
++#: en/lb_config.1:439
+ #, no-wrap
+ msgid "B<--firmware-binary> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:439
++#: en/lb_config.1:441
+ msgid ""
+ "defines if firmware packages should be automatically included into the "
+ "binary pool for debian-installer. Note that only firmware packages available "
+@@ -2151,13 +2156,13 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:439
++#: en/lb_config.1:441
+ #, no-wrap
+ msgid "B<--firmware-chroot> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:441
++#: en/lb_config.1:443
+ msgid ""
+ "defines if firmware packages should be automatically included into the live "
+ "image. Note that only firmware packages available within the configured "
+@@ -2167,65 +2172,65 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:441
++#: en/lb_config.1:443
+ #, no-wrap
+ msgid "B<--swap-file-path> I<PATH>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:443
++#: en/lb_config.1:445
+ msgid ""
+ "defines the path to a swap file to create in the binary image. Default is "
+ "not to create a swap file."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:443
++#: en/lb_config.1:445
+ #, no-wrap
+ msgid "B<--swap-file-size> I<MB>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:445
++#: en/lb_config.1:447
+ msgid ""
+ "defines what size in megabytes the swap file should be, if one is to be "
+ "created. Default is 512MB."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:445
++#: en/lb_config.1:447
+ #, no-wrap
+ msgid "B<--tasksel> apt|aptitude|tasksel"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:447
++#: en/lb_config.1:449
+ msgid ""
+ "selects which program is used to install tasks. By default, this is set to "
+ "tasksel."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:447
++#: en/lb_config.1:449
+ #, no-wrap
+ msgid "B<--templates> I<PATH>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:449
++#: en/lb_config.1:451
+ msgid ""
+ "sets the path to the templates that live-build is going to use, e.g. for "
+ "bootloaders. By default, this is set to /usr/share/live/build/templates/."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:449
++#: en/lb_config.1:451
+ #, no-wrap
+ msgid "B<--hdd-size> MB"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:451
++#: en/lb_config.1:453
+ msgid ""
+ "defines what size the hdd image should be. Note that although the default is "
+ "set to 10000 (= 10GB), it will not need 10GB space on your harddisk as the "
+@@ -2233,63 +2238,76 @@ msgid ""
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:451
++#: en/lb_config.1:453
+ #, no-wrap
+ msgid "B<--updates> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:453
++#: en/lb_config.1:455
+ msgid ""
+ "defines if debian updates package archives should be included in the image "
+ "or not."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:453
++#: en/lb_config.1:455
++#, no-wrap
++msgid "B<--use-original-packages-list> true|false"
++msgstr ""
++
++#. type: Plain text
++#: en/lb_config.1:457
++msgid ""
++"defines if a local Packages list is generated for the image, or if the "
++"original Packages file of the entire distribution is copied to the image."
++msgstr ""
++
++#. type: IP
++#: en/lb_config.1:457
+ #, no-wrap
+ msgid "B<--backports> true|false"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:455
++#: en/lb_config.1:459
+ msgid ""
+ "defines if debian backports package archives should be included in the image "
+ "or not."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:455 en/live-build.7:42
++#: en/lb_config.1:459 en/live-build.7:42
+ #, no-wrap
+ msgid "B<--verbose>"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:457
++#: en/lb_config.1:461
+ msgid "increases the verbosity of messages output by B<lb build>."
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:457
++#: en/lb_config.1:461
+ #, no-wrap
+ msgid "B<--win32-loader true|false>"
+ msgstr ""
+ 
+ #.  FIXME
+ #. type: Plain text
+-#: en/lb_config.1:460
++#: en/lb_config.1:464
+ msgid "defines if win32-loader should be included in the binary image or not."
+ msgstr ""
+ 
+ #. type: SH
+-#: en/lb_config.1:461
++#: en/lb_config.1:465
+ #, no-wrap
+ msgid "ENVIRONMENT"
+ msgstr ""
+ 
+ #.  FIXME
+ #. type: Plain text
+-#: en/lb_config.1:464
++#: en/lb_config.1:468
+ msgid ""
+ "Currently, command line switches can also be specified through the "
+ "corresponding environment variable. However, this generally should not be "
+@@ -2303,20 +2321,20 @@ msgstr ""
+ 
+ #.  FIXME
+ #. type: IP
+-#: en/lb_config.1:468
++#: en/lb_config.1:472
+ #, no-wrap
+ msgid "B<auto/config>"
+ msgstr ""
+ 
+ #. type: IP
+-#: en/lb_config.1:469
++#: en/lb_config.1:473
+ #, no-wrap
+ msgid "B</etc/live/build.conf, /etc/live/build/*>"
+ msgstr ""
+ 
+ #.  FIXME
+ #. type: Plain text
+-#: en/lb_config.1:472
++#: en/lb_config.1:476
+ msgid ""
+ "An optional, global configuration file for B<lb config> variables. It is "
+ "useful to specify a few system wide defaults, like "
+@@ -2325,11 +2343,11 @@ msgid ""
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:477 en/live-build.7:221
++#: en/lb_config.1:481 en/live-build.7:221
+ msgid "I<live-boot>(7)"
+ msgstr ""
+ 
+ #. type: Plain text
+-#: en/lb_config.1:479 en/live-build.7:223
++#: en/lb_config.1:483 en/live-build.7:223
+ msgid "I<live-config>(7)"
+ msgstr ""
+diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
+index 0584c59..e0dce2f 100755
+--- a/scripts/build/binary_package-lists
++++ b/scripts/build/binary_package-lists
+@@ -38,6 +38,71 @@ Check_lockfile .lock
+ # Creating lock file
+ Create_lockfile .lock
+ 
++# The function Download_file() was copied from installer_debian-installer
++# and changed to Download_file_or_quit() and Download_file_or_ignore()
++
++# Set absolute directory for caching; we require it when we call Download_file
++# from a non-standard cwd.
++_LB_CACHE_DIR="$(pwd)/cache/binary_package-lists"
++
++Download_file_2 () {
++	local _LB_TARGET
++	_LB_TARGET="${1}"
++
++	local _LB_URL
++	_LB_URL="${2}"
++
++	local _LB_EXIT_ON_ERROR
++	_LB_EXIT_ON_ERROR="${3}"
++
++	_LB_CACHE_FILE="${_LB_CACHE_DIR}/$(echo "${_LB_URL}" | sed 's|/|_|g')"
++
++	if [ ! -f "${_LB_CACHE_FILE}" ]
++	then
++		mkdir -p ${_LB_CACHE_DIR}
++		if ! wget ${WGET_OPTIONS} -O "${_LB_CACHE_FILE}" "${_LB_URL}"
++		then
++			rm -f "${_LB_CACHE_FILE}"
++
++			if [ "${_LB_EXIT_ON_ERROR}" = "true" ]; then
++				Echo_error "Could not download file: %s" "${_LB_URL}"
++				exit 1
++			else
++				Echo_warning "Could not download file: %s" "${_LB_URL}"
++				return
++			fi
++		fi
++	fi
++
++	if [ "$(stat --printf %d "${_LB_CACHE_DIR}")" = "$(stat --printf %d ./)" ]
++	then
++		CP_OPTIONS="-l"
++	fi
++
++	cp -f ${CP_OPTIONS} -- "${_LB_CACHE_FILE}" "${_LB_TARGET}"
++}
++
++Download_file_or_quit() {
++	local _LB_TARGET
++	_LB_TARGET="${1}"
++
++	local _LB_URL
++	_LB_URL="${2}"
++
++	Download_file_2 "${_LB_TARGET}" "${_LB_URL}" "true"
++}
++
++Download_file_or_ignore() {
++	local _LB_TARGET
++	_LB_TARGET="${1}"
++
++	local _LB_URL
++	_LB_URL="${2}"
++
++	Download_file_2 "${_LB_TARGET}" "${_LB_URL}" "false"
++}
++
++
+ case "${LB_MODE}" in
+ 	progress-linux)
+ 		DISTS="installer/dists"
+@@ -108,6 +173,10 @@ then
+ 		fi
+ 	done
+ 
++	case "${LB_BINARY_USE_ORIGINAL_PACKAGES_LIST}" in
++		false)
++		# this is the default behaviour, determine the directory
++		# tree based on the source package name
+ 	for FILE in chroot/binary.deb/archives/*.deb
+ 	do
+ 		SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
+@@ -144,19 +213,117 @@ then
+ 		# Move files
+ 		mv "${FILE}" binary/${POOL}/${SECTION}/"${LETTER}"/"${SOURCE}"
+ 	done
++		;;
+ 
+-	cd binary
++		true) # LB_BINARY_USE_ORIGINAL_PACKAGE_LIST
++		# (mostly for Devuan); get Filename: information from
++		# Packages file, because the pool is split between different
++		# projects (DEBIAN/DEVUAN/MARILLAT)
++		#
++		# Using the original Packages file takes much more
++		# room, but it's at least signed if you make your own
++		# sub-distro.
++		Echo_message "Use original Packages lists..."
++
++		rm -f binary/tmp.packages_filenames
++
++		mkdir -p binary/dists/${LB_DISTRIBUTION}
++		cd binary/dists/${LB_DISTRIBUTION}
++		# Download_file binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Release "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/${_ARCHIVE_AREA}/binary-"${LIVE_IMAGE_ARCHITECTURE}"/Release
++		# Fetching release
++		Echo_message "Download_file_or_quit Release ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/Release"
++		Download_file_or_quit Release "${LB_MIRROR_CHROOT}"/dists/"${LB_DISTRIBUTION}"/Release
++		# just download all three Packages.gz files?? TODO
++		for _ARCHIVE_AREA in main contrib non-free; do
++			rm -f tmp.Packages.gz
++			Echo_message "Download_file_or_ignore tmp.Packages.gz ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz"
++			Download_file_or_ignore tmp.Packages.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DISTRIBUTION}"/${_ARCHIVE_AREA}/binary-"${LIVE_IMAGE_ARCHITECTURE}"/Packages.gz
++			if [ -f tmp.Packages.gz ]; then
++				zcat tmp.Packages.gz |grep '^[Ff]ilename:' | awk '{print $2}' |sort >> ${OLDPWD}/binary/tmp.packages_filenames
++				mv tmp.Packages.gz $_ARCHIVE_AREA/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz
++			fi
++		done # _ARCHIVE_AREA
++		Echo_message "DBG: All downloaded. now placing the .debs."
+ 
+-	for SECTION in ${POOL}/*
++
++		cd ${OLDPWD}
++
++        Echo_message "moving chroot/binary.deb/archives .debs"
++
++	# TODO with a for-loop is dead slow now with all the grepping
++	for FILE in chroot/binary.deb/archives/*.deb
+ 	do
+-		SECTION="$(basename ${SECTION})"
++		BASEFILE=$( basename "$FILE" )
++
++		# The files in the pool directory can occur in many
++		# different distros, so they have "normal" Debian package
++		# versions.
++
++		# But the downloaded ones may have an additional "epoch"
++		# identifier that looks like <number>: pre-pended to
++		# the actual version number. And then it's also URL-encoded,
++		# of course, in case anyone wants to download it on VAX/VMS.
++		# (debian-policy paragraph 5.6.12 Version. I made that up
++		# about VAX/VMS :-) )
++		EPOCHLESSFILE=$( echo "$BASEFILE" | sed -e 's/_[0-9][0-9]*%3a/_/;' )
++		FOUND=$( grep '/'"$EPOCHLESSFILE"'$' binary/tmp.packages_filenames )
++		if [ "$FOUND" = "" ]; then
++			Echo_error "$FILE not found in Packages.gz"
++		else
++			PUTITHERE=$( dirname $FOUND )
++#DBG#			Echo "DBG place $FILE in $PUTITHERE/$EPOCHLESSFILE"
++			mkdir -p binary/$PUTITHERE
++			mv $FILE binary/$PUTITHERE/$EPOCHLESSFILE
++		fi
++	done
++        Echo_message "copying chroot/packages.bootstrap/ .debs"
+ 
+-		mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}
+-		apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages
+-		gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz
++	# TODO with a for-loop is dead slow now with all the grepping
++	for FILE in cache/packages.bootstrap/*.deb
++	do
++		BASEFILE=$( basename "$FILE" )
++
++		# The files in the pool directory can occur in many
++		# different distros, so they have "normal" Debian package
++		# versions.
++
++		# But the downloaded ones may have an additional "epoch"
++		# identifier that looks like <number>: pre-pended to
++		# the actual version number. And then it's also URL-encoded,
++		# of course, in case anyone wants to download it on VAX/VMS.
++		# (debian-policy paragraph 5.6.12 Version. I made that up
++		# about VAX/VMS :-) )
++		EPOCHLESSFILE=$( echo "$BASEFILE" | sed -e 's/_[0-9][0-9]*%3a/_/;' )
++		FOUND=$( grep '/'"$EPOCHLESSFILE"'$' binary/tmp.packages_filenames )
++		if [ "$FOUND" = "" ]; then
++			Echo_error "bootstrap $FILE not found in Packages.gz"
++		else
++			PUTITHERE=$( dirname $FOUND )
++#DBG#			Echo "DBG place $FILE in $PUTITHERE/$EPOCHLESSFILE"
++			mkdir -p binary/$PUTITHERE
++			cp -p $FILE binary/$PUTITHERE/$EPOCHLESSFILE
++		fi
+ 	done
+ 
+-	cd "${OLDPWD}"
++	Echo_message "binary_package-lists: all done"
++
++		;;
++	esac # LB_BINARY_USE_ORIGINAL_PACKAGE_LIST
++
++	if [ "${LB_BINARY_USE_ORIGINAL_PACKAGE_LIST}" = "false" ]; then
++		cd binary
++
++		for SECTION in ${POOL}/*
++		do
++			SECTION="$(basename ${SECTION})"
++
++			mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}
++			apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages
++			gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz
++		done
++
++		cd "${OLDPWD}"
++	fi # LB_BINARY_USE_ORIGINAL_PACKAGE_LIST
+ 
+ 	rm -f chroot/bin/Packages
+ 
+diff --git a/scripts/build/config b/scripts/build/config
+index e3b1e51..13238b8 100755
+--- a/scripts/build/config
++++ b/scripts/build/config
+@@ -117,6 +117,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
+ \t    [--templates PATH]\n\
+ \t    [--updates true|false]\n\
+ \t    [--backports true|false]\n\
++\t    [--use-original-packages-list]\n\
+ \t    [--verbose]\n\
+ \t    [--loadlin true|false]\n\
+ \t    [--win32-loader true|false]\n\
+@@ -714,6 +715,11 @@ Local_arguments ()
+ 				shift 2
+ 				;;
+ 
++			--use-original-packages-list)
++				LB_BINARY_USE_ORIGINAL_PACKAGES_LIST="${2}"
++				shift 2
++				;;
++
+ 			# other
+ 			--breakpoints)
+ 				_BREAKPOINTS="true"
+@@ -1307,6 +1313,11 @@ LB_SWAP_FILE_PATH="${LB_SWAP_FILE_PATH}"
+ # \$LB_SWAP_FILE_SIZE: set swap file size
+ # (Default: ${LB_SWAP_FILE_SIZE})
+ LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE}"
++
++# \$LB_BINARY_USE_ORIGINAL_PACKAGES_LIST: don't reconstruct Packages, use original
++# (Default: ${LB_BINARY_USE_ORIGINAL_PACKAGES_LIST})
++LB_BINARY_USE_ORIGINAL_PACKAGES_LIST="${LB_BINARY_USE_ORIGINAL_PACKAGES_LIST}"
++
+ EOF
+ 
+ # Creating lb_source_* configuration
diff -Nru live-build-4.0.3/debian/patches/0004-Devuan-specific-changes-to-defaults-and-configuratio.patch live-build-4.0.3/debian/patches/0004-Devuan-specific-changes-to-defaults-and-configuratio.patch
--- live-build-4.0.3/debian/patches/0004-Devuan-specific-changes-to-defaults-and-configuratio.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/0004-Devuan-specific-changes-to-defaults-and-configuratio.patch	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,219 @@
+From: Frits Daalmans <frits@daalmansdata.eu>
+Date: Mon, 28 Dec 2015 15:33:28 +0100
+Subject: Devuan specific changes to defaults and configuration
+
+---
+ functions/defaults.sh | 78 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ scripts/build/config  | 14 +++++++++
+ 2 files changed, 89 insertions(+), 3 deletions(-)
+
+diff --git a/functions/defaults.sh b/functions/defaults.sh
+index feebdee..39755cc 100755
+--- a/functions/defaults.sh
++++ b/functions/defaults.sh
+@@ -96,13 +96,13 @@ Set_defaults ()
+ 	# Setting system type
+ 	LB_SYSTEM="${LB_SYSTEM:-live}"
+ 
+-	# Setting mode (currently: debian, progress-linux, and ubuntu)
++	# Setting mode (currently: debian, progress-linux, ubuntu, and devuan)
+ 	if [ -x /usr/bin/lsb_release ]
+ 	then
+ 		_DISTRIBUTOR="$(lsb_release -is | tr "[A-Z]" "[a-z]")"
+ 
+ 		case "${_DISTRIBUTOR}" in
+-			debian|progress-linux|ubuntu)
++			debian|progress-linux|ubuntu|devuan)
+ 				LB_MODE="${LB_MODE:-${_DISTRIBUTOR}}"
+ 				;;
+ 
+@@ -117,6 +117,9 @@ Set_defaults ()
+ 		elif [ -e /etc/ubuntu_version ]
+ 		then
+ 			LB_MODE="${LB_MODE:-ubuntu}"
++		elif [ -e /etc/devuan_version ]
++		then
++			LB_MODE="${LB_MODE:-devuan}"
+ 		else
+ 			LB_MODE="${LB_MODE:-debian}"
+ 		fi
+@@ -201,6 +204,12 @@ Set_defaults ()
+ 			LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS:-false}"
+ 			;;
+ 
++		devuan)
++			# jessie alpha version has some problems with
++			# GTK deps otherwise
++			LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS:-false}"
++			;;
++
+ 		*)
+ 			LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS:-true}"
+ 			;;
+@@ -285,6 +294,17 @@ Set_defaults ()
+ 			esac
+ 			;;
+ 
++		devuan)
++			case "${LB_DISTRIBUTION}" in
++				jessie*)
++					LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
++					;;
++				*) # who knows? s6? runit? we shall see :-)
++					LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
++					;;
++			esac
++			;;
++
+ 		*)
+ 			case "${LB_SYSTEM}" in
+ 				live)
+@@ -395,6 +415,12 @@ Set_defaults ()
+ 
+ 			LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}"
+ 			;;
++
++		devuan)
++			LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://packages.devuan.org/merged}"
++			LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}"
++			;;
++
+ 	esac
+ 
+ 	LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT:-${LB_PARENT_MIRROR_BOOTSTRAP}}"
+@@ -425,6 +451,12 @@ Set_defaults ()
+ 
+ 			LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}"
+ 			;;
++
++		devuan) # N.B. this should probably be changed once devuan has a security repository
++			LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
++			LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}"
++			;;
++
+ 	esac
+ 
+ 	# Setting mirror which ends up in the image
+@@ -452,6 +484,12 @@ Set_defaults ()
+ 
+ 			LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
+ 			;;
++
++		devuan)
++			LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://packages.devuan.net/merged}"
++			LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
++			;;
++
+ 	esac
+ 
+ 	# Setting security mirror which ends up in the image
+@@ -479,6 +517,12 @@ Set_defaults ()
+ 
+ 			LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}"
+ 			;;
++
++		devuan) # N.B. this should probably be changed once devuan has a security repository
++			LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.debian.org/}"
++			LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}"
++			;;
++
+ 	esac
+ 
+ 	case "${LB_MODE}" in
+@@ -510,6 +554,10 @@ Set_defaults ()
+ 			LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-ubuntu-keyring}"
+ 			;;
+ 
++		devuan)
++			LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-devuan-keyring}"
++			;;
++
+ 		*)
+ 			LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-debian-archive-keyring}"
+ 			;;
+@@ -741,7 +789,7 @@ Set_defaults ()
+ 
+ 	# Setting debian-installer-gui
+ 	case "${LB_MODE}" in
+-		debian|progress-linux)
++		debian|progress-linux|devuan)
+ 			LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-true}"
+ 			;;
+ 
+@@ -843,6 +891,10 @@ Set_defaults ()
+ 		ubuntu)
+ 			LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Ubuntu Live}"
+ 			;;
++
++		devuan)
++			LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Devuan Live}"
++			;;
+ 	esac
+ 
+ 	# Set iso preparer
+@@ -872,6 +924,10 @@ Set_defaults ()
+ 		ubuntu)
+ 			LB_HDD_LABEL="${LB_HDD_LABEL:-UBUNTU}"
+ 			;;
++
++		devuan)
++			LB_HDD_LABEL="${LB_HDD_LABEL:-DEVUAN_LIVE}"
++			;;
+ 	esac
+ 
+ 	# Setting hdd size
+@@ -890,6 +946,11 @@ Set_defaults ()
+ 		ubuntu)
+ 			LB_ISO_VOLUME="${LB_ISO_VOLUME:-Ubuntu ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}"
+ 			;;
++
++		devuan)
++			LB_ISO_VOLUME="${LB_ISO_VOLUME:-Devuan ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}"
++			;;
++
+ 	esac
+ 
+ 	# Setting memtest option
+@@ -989,6 +1050,17 @@ Set_defaults ()
+ 
+ 	# Setting image type
+ 	LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES:-tar}"
++
++	## download Packages file instead of reconstructing it
++	case "${LB_MODE}" in
++		devuan)
++		LB_BINARY_USE_ORIGINAL_PACKAGES_LIST="${LB_BINARY_USE_ORIGINAL_PACKAGES_LIST:-true}"
++		;;
++
++		*)
++		LB_BINARY_USE_ORIGINAL_PACKAGES_LIST="${LB_BINARY_USE_ORIGINAL_PACKAGES_LIST:-false}"
++		;;
++	esac
+ }
+ 
+ Check_defaults ()
+diff --git a/scripts/build/config b/scripts/build/config
+index 13238b8..f499b2f 100755
+--- a/scripts/build/config
++++ b/scripts/build/config
+@@ -1375,6 +1375,20 @@ case "${LB_PARENT_DISTRIBUTION}" in
+ 		echo "live-config-sysvinit" >> config/package-lists/live.list.chroot
+ 		;;
+ 
++	jessie)
++		# N.B. "jessie" is ambiguous: DeVUan or DeBIan jessie?
++		# distros descending from DeBIan jessie probably want live-config-systemd here
++		# but distros descending from DeVUan jessie probably want live-config-sysvinit here
++		case "${LB_MODE}" in
++			devuan)
++				echo "live-config-sysvinit" >> config/package-lists/live.list.chroot
++				;;
++			*)
++				echo "live-config-systemd" >> config/package-lists/live.list.chroot
++				;;
++		esac
++		;;
++
+ 	*)
+ 		echo "live-config-systemd" >> config/package-lists/live.list.chroot
+ 		;;
diff -Nru live-build-4.0.3/debian/patches/0005-Use-the-debootstrap-exclude-option-if-LB_INITSYSTEM-.patch live-build-4.0.3/debian/patches/0005-Use-the-debootstrap-exclude-option-if-LB_INITSYSTEM-.patch
--- live-build-4.0.3/debian/patches/0005-Use-the-debootstrap-exclude-option-if-LB_INITSYSTEM-.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/0005-Use-the-debootstrap-exclude-option-if-LB_INITSYSTEM-.patch	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,79 @@
+From: Frits Daalmans <frits@daalmansdata.eu>
+Date: Mon, 28 Dec 2015 15:35:56 +0100
+Subject: Use the debootstrap --exclude option if LB_INITSYSTEM == sysvinit
+
+---
+ scripts/build/bootstrap_debootstrap | 33 +++++++++++++++++++++++++++++----
+ 1 file changed, 29 insertions(+), 4 deletions(-)
+
+diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
+index 4146788..a7bfb17 100755
+--- a/scripts/build/bootstrap_debootstrap
++++ b/scripts/build/bootstrap_debootstrap
+@@ -81,6 +81,25 @@ then
+ 	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --no-check-gpg"
+ fi
+ 
++# init system dependent hack
++# this is because the init package has
++# Depends: systemd-sysv | sysvinit-core | upstart
++# and debootstrap's pkgdetails_perl function chokes quite easily on that
++DEBOOTSTRAP_EXCLUDE_OPTION=""
++case "${LB_INITSYSTEM}" in
++	systemd)
++		# no tweaks needed AFAIK
++		;;
++	sysvinit)
++		DEBOOTSTRAP_EXCLUDE_OPTION="${DEBOOTSTRAP_EXCLUDE_OPTION:+${DEBOOTSTRAP_EXCLUDE_OPTION},}systemd-sysv,libpam-systemd"
++		;;
++	*)
++		# no tweaks needed AFAIK
++		;;
++esac
++
++DEBOOTSTRAP_EXCLUDE="${DEBOOTSTRAP_EXCLUDE_OPTION:+--exclude=${DEBOOTSTRAP_EXCLUDE_OPTION}}"
++
+ if [ -x "/usr/sbin/debootstrap" ]
+ then
+ 	if [ "${LB_CACHE_PACKAGES}" = "true" ]
+@@ -92,7 +111,8 @@ then
+ 		fi
+ 
+ 		Echo_breakage "Running debootstrap (download-only)... "
+-		debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
++		Echo_message "Executing debootstrap ${DEBOOTSTRAP_OPTIONS} ${DEBOOTSTRAP_EXCLUDE} --download-only ${LB_PARENT_DISTRIBUTION} chroot ${LB_PARENT_MIRROR_BOOTSTRAP}"
++		debootstrap ${DEBOOTSTRAP_OPTIONS} ${DEBOOTSTRAP_EXCLUDE} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
+ 
+ 		# Removing old cache
+ 		rm -f cache/packages.bootstrap/*.deb
+@@ -104,22 +124,27 @@ then
+ 
+ 	Echo_breakage "Running debootstrap... "
+ 
++
+ 	# Run appropriate bootstrap, i.e. foreign or regular bootstrap
+ 	if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LIVE_IMAGE_ARCHITECTURE}" ]; then
+ 
+ 		if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ]
+ 		then
+-			DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_QEMU_EXCLUDE} | sed 's|  *|,|g')"
++			DEBOOTSTRAP_EXCLUDE_OPTION="${DEBOOTSTRAP_EXCLUDE_OPTION:+${DEBOOTSTRAP_EXCLUDE_OPTION},}$(echo ${LB_BOOTSTRAP_QEMU_EXCLUDE} | sed 's|  *|,|g')"
++			DEBOOTSTRAP_EXCLUDE="${DEBOOTSTRAP_EXCLUDE_OPTION:+--exclude=${DEBOOTSTRAP_EXCLUDE_OPTION}}"
+ 		fi
+ 
+ 		Echo_message "Bootstrap will be foreign"
+-		debootstrap ${DEBOOTSTRAP_OPTIONS} --foreign "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
++		Echo_message "Executing debootstrap ${DEBOOTSTRAP_OPTIONS} ${DEBOOTSTRAP_EXCLUDE} --foreign ${LB_PARENT_DISTRIBUTION} chroot ${LB_PARENT_MIRROR_BOOTSTRAP}"
++		debootstrap ${DEBOOTSTRAP_OPTIONS} ${DEBOOTSTRAP_EXCLUDE} --foreign "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
+ 
+ 		Echo_message "Running debootstrap second stage under QEMU"
+ 		cp ${LB_BOOTSTRAP_QEMU_STATIC} chroot/usr/bin
+ 		Chroot chroot /bin/sh /debootstrap/debootstrap --second-stage
+ 	else
+-		debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
++
++		Echo_message "Executing debootstrap ${DEBOOTSTRAP_OPTIONS} ${DEBOOTSTRAP_EXCLUDE} ${LB_PARENT_DISTRIBUTION} chroot ${LB_PARENT_MIRROR_BOOTSTRAP}"
++		debootstrap ${DEBOOTSTRAP_OPTIONS} ${DEBOOTSTRAP_EXCLUDE} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
+ 	fi
+ 
+ 	# Deconfiguring debootstrap configurations
diff -Nru live-build-4.0.3/debian/patches/0006-Devuan-specific-modified-.udeb-package-path.patch live-build-4.0.3/debian/patches/0006-Devuan-specific-modified-.udeb-package-path.patch
--- live-build-4.0.3/debian/patches/0006-Devuan-specific-modified-.udeb-package-path.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/0006-Devuan-specific-modified-.udeb-package-path.patch	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,51 @@
+From: Frits Daalmans <frits@daalmansdata.eu>
+Date: Mon, 28 Dec 2015 15:43:05 +0100
+Subject: Devuan-specific modified .udeb package path With this patch,
+ installer_debian-installer searches multiple pool/ subdirectories
+ for .udebs, specifically pool/DEBIAN and pool/DEVUAN.
+
+---
+ scripts/build/installer_debian-installer | 28 ++++++++++++++++++++++++++--
+ 1 file changed, 26 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
+index 54c7e91..6e62f69 100755
+--- a/scripts/build/installer_debian-installer
++++ b/scripts/build/installer_debian-installer
+@@ -706,10 +706,34 @@ then
+ 	mkdir -p dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_IMAGE_ARCHITECTURE}"
+ 	cd "${OLDPWD}"
+ 
+-	mv binary.udeb chroot/root
+-	echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages" > chroot/binary.sh
++	# needed for resume
++	rm -rf chroot/root/binary.udeb
++
++	mv binary.udeb chroot/root/
++
++	# Debian has all udebs under pool/main,
++	# Devuan has them spread out between pool/DEVUAN/main and
++	# pool/DEBIAN/main (no udebs in pool/MARILLAT/main AFAIK)
++	# so we must run apt-ftparchive more than once.
++	DISTROS=""
++	case "${LB_MODE}" in
++	devuan)
++		DISTROS="pool/DEVUAN pool/DEBIAN" # Devuan compatibility
++		;;
++	*)
++		DISTROS="pool/main" # Debian compatibility
++		;;
++	esac
++
++	echo "cd /root/binary.udeb && rm -f tmp.Packages tmp.Packages.err && for d in ${DISTROS}; do apt-ftparchive packages \${d} 2>> tmp.Packages.err >> tmp.Packages; done; cp tmp.Packages dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages" > chroot/binary.sh
+ 	Chroot chroot "sh binary.sh"
+ 	rm -f chroot/binary.sh
++	if [ -s chroot/root/binary.udeb/tmp.Packages.err ]; then
++		echo "Errors in apt-ftparchive of udebs:"
++		cat chroot/root/binary.udeb/tmp.Packages.err
++	fi
++	rm -f chroot/root/binary.udeb/tmp.Packages chroot/root/binary.udeb/tmp.Packages.err
++
+ 	mv chroot/root/binary.udeb ./
+ 
+ 	cd binary.udeb
diff -Nru live-build-4.0.3/debian/patches/0007-Devuan-specific-write-cdrom-.disk-base_exclude.patch live-build-4.0.3/debian/patches/0007-Devuan-specific-write-cdrom-.disk-base_exclude.patch
--- live-build-4.0.3/debian/patches/0007-Devuan-specific-write-cdrom-.disk-base_exclude.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/0007-Devuan-specific-write-cdrom-.disk-base_exclude.patch	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,29 @@
+From: Frits Daalmans <frits@daalmansdata.eu>
+Date: Mon, 28 Dec 2015 15:46:10 +0100
+Subject: Devuan-specific: write /cdrom/.disk/base_exclude Write
+ /cdrom/.disk/base_exclude,
+ so that the run-debootstrap program of the base installer can pick up the
+ debootstrap --exclude option. Harmless on other LB_MODE distros.
+
+---
+ scripts/build/binary_disk | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
+index 2184a3f..13ac138 100755
+--- a/scripts/build/binary_disk
++++ b/scripts/build/binary_disk
+@@ -72,6 +72,13 @@ case "${LB_MODE}" in
+ 		TRACE="project/trace/archive-master.progress-linux.org"
+ 		;;
+ 
++	devuan)
++		TITLE="Devuan GNU/Linux"
++		STRING="Build ${ARCHITECTURE}"
++		TRACE=""
++		echo "systemd-sysv,libpam-systemd" >> binary/.disk/base_exclude
++		;;
++
+ 	*)
+ 		TITLE="Debian GNU/Linux"
+ 		STRING="Snapshot ${ARCHITECTURE}"
diff -Nru live-build-4.0.3/debian/patches/0008-Workaround-to-find-firmware-packages.patch live-build-4.0.3/debian/patches/0008-Workaround-to-find-firmware-packages.patch
--- live-build-4.0.3/debian/patches/0008-Workaround-to-find-firmware-packages.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/0008-Workaround-to-find-firmware-packages.patch	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,99 @@
+From: Frits Daalmans <frits@daalmansdata.eu>
+Date: Mon, 28 Dec 2015 15:49:21 +0100
+Subject: Workaround to find firmware packages If Contents-<$arch>.gz cannot
+ be downloaded,
+ and therefore packages that contain /lib/firmware cannot be found,
+ fall back to firmware-linux-free
+
+---
+ scripts/build/chroot_firmware            | 18 +++++++++++++++---
+ scripts/build/installer_debian-installer | 13 +++++++++++--
+ 2 files changed, 26 insertions(+), 5 deletions(-)
+
+diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware
+index b2446f7..5bcde3b 100755
+--- a/scripts/build/chroot_firmware
++++ b/scripts/build/chroot_firmware
+@@ -62,7 +62,7 @@ rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCH
+ 
+ for _CONTENT in ${_CONTENTS}
+ do
+-	wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
++	wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} || true
+ 
+ 	FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
+ done
+@@ -84,17 +84,29 @@ then
+ 
+ 	for _CONTENT in ${_CONTENTS}
+ 	do
+-		wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
++		wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} || true
+ 
+ 		FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
+ 	done
+ fi
+ 
++
++if ! $( echo "${FIRMWARE_PACKAGES}" | grep -q '[a-z0-9]' ); then
++	# FIXME hard-wired Linux-specific package
++	FIRMWARE_PACKAGES="firmware-linux-free"
++	Echo_warning "chroot_firmware Warning: no Linux firmware packages found or no Contents-${LIVE_IMAGE_ARCHITECTURE}.gz file(s) found, falling back to default ${FIRMWARE_PACKAGES}"
++fi
++
++
+ # Drop section and keep package names only
++DBG_FIRMWARE_PACKAGES=""
+ for _PACKAGE in ${FIRMWARE_PACKAGES}
+ do
+-	echo $(echo ${_PACKAGE} | awk -F/ '{ print $NF }') >> chroot/root/packages.chroot
++	CUR_FIRMWARE_PACKAGE=$( echo $(echo ${_PACKAGE} | awk -F/ '{ print $NF }') )
++	DBG_FIRMWARE_PACKAGES="${DBG_FIRMWARE_PACKAGES} ${CUR_FIRMWARE_PACKAGE}"
++	echo "${CUR_FIRMWARE_PACKAGE}" >> chroot/root/packages.chroot
+ done
++Echo_message "chroot_firmware selected the following firmware packages for installation: ${DBG_FIRMWARE_PACKAGES}"
+ 
+ # Some known licenses required to be accepted
+ if echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
+diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
+index 6e62f69..5cbd6da 100755
+--- a/scripts/build/installer_debian-installer
++++ b/scripts/build/installer_debian-installer
+@@ -422,10 +422,11 @@ then
+ 		_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)"
+ 
+ 		rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
++		touch cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
+ 
+ 		for _CONTENT in ${_CONTENTS}
+ 		do
+-			wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
++			wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} || true
+ 
+ 			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
+ 		done
+@@ -444,15 +445,23 @@ then
+ 			_CONTENTS="$(for _ARCHIVE_AREA in ${LIVE_IMAGE_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)"
+ 
+ 			rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
++			touch cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
+ 
+ 			for _CONTENT in ${_CONTENTS}
+ 			do
+-				wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
++				wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} || true
+ 
+ 				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
+ 			done
+ 		fi
+ 
++		if ! $( echo "${FIRMWARE_PACKAGES}" | grep -q '[a-z0-9]' ); then
++			# FIXME hard-wired Linux-specific package
++			FIRMWARE_PACKAGES="firmware-linux-free"
++			Echo_warning "installer_debian-installer Warning: no Linux firmware packages found or no Contents-${LIVE_IMAGE_ARCHITECTURE}.gz file(s) found, falling back to default ${FIRMWARE_PACKAGES}"
++		fi
++
++
+ 		# Drop section and keep package names only
+ 		for _PACKAGE in ${FIRMWARE_PACKAGES}
+ 		do
diff -Nru live-build-4.0.3/debian/patches/0009-Slightly-hacky-workarounds-for-when-Packages-is-unav.patch live-build-4.0.3/debian/patches/0009-Slightly-hacky-workarounds-for-when-Packages-is-unav.patch
--- live-build-4.0.3/debian/patches/0009-Slightly-hacky-workarounds-for-when-Packages-is-unav.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/0009-Slightly-hacky-workarounds-for-when-Packages-is-unav.patch	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,48 @@
+From: Frits Daalmans <frits@daalmansdata.eu>
+Date: Mon, 28 Dec 2015 15:53:47 +0100
+Subject: Slightly hacky workarounds for when Packages is unavailable but
+ Packages.gz is present
+
+---
+ scripts/build/binary_package-lists | 1 +
+ scripts/build/chroot_archives      | 8 +++++++-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
+index e0dce2f..98065cb 100755
+--- a/scripts/build/binary_package-lists
++++ b/scripts/build/binary_package-lists
+@@ -240,6 +240,7 @@ then
+ 			Download_file_or_ignore tmp.Packages.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DISTRIBUTION}"/${_ARCHIVE_AREA}/binary-"${LIVE_IMAGE_ARCHITECTURE}"/Packages.gz
+ 			if [ -f tmp.Packages.gz ]; then
+ 				zcat tmp.Packages.gz |grep '^[Ff]ilename:' | awk '{print $2}' |sort >> ${OLDPWD}/binary/tmp.packages_filenames
++				mkdir -p ${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/
+ 				mv tmp.Packages.gz $_ARCHIVE_AREA/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz
+ 			fi
+ 		done # _ARCHIVE_AREA
+diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
+index bae7439..410acfa 100755
+--- a/scripts/build/chroot_archives
++++ b/scripts/build/chroot_archives
+@@ -673,6 +673,11 @@ EOF
+ 			fi
+ 		fi
+ 
++		Echo_message "chroot/etc/apt/${_PARENT_FILE} now contains:"
++		while read tmp_txt; do
++			Echo_message "${tmp_txt}"
++		done < chroot/etc/apt/${_PARENT_FILE}
++
+ 		# Removing chroot-only apt sources
+ 		for FILE in config/archives/*.list.chroot
+ 		do
+@@ -749,7 +754,8 @@ EOF
+ 		done
+ 
+ 		# Updating indices
+-		Apt chroot update
++		# It tends to crash here if Packages is unavailable but Packages.gz is
++		Apt chroot update || true
+ 
+ 		# Cleaning apt package cache
+ 		rm -rf chroot/var/cache/apt
diff -Nru live-build-4.0.3/debian/patches/0010-merge-with-prev-patch.patch live-build-4.0.3/debian/patches/0010-merge-with-prev-patch.patch
--- live-build-4.0.3/debian/patches/0010-merge-with-prev-patch.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/0010-merge-with-prev-patch.patch	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,26 @@
+From: Frits Daalmans <frits@daalmansdata.eu>
+Date: Mon, 28 Dec 2015 16:01:05 +0100
+Subject: merge with prev patch
+
+---
+ scripts/build/chroot_archives | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
+index 410acfa..5de6685 100755
+--- a/scripts/build/chroot_archives
++++ b/scripts/build/chroot_archives
+@@ -754,8 +754,11 @@ EOF
+ 		done
+ 
+ 		# Updating indices
+-		# It tends to crash here if Packages is unavailable but Packages.gz is
+-		Apt chroot update || true
++		UPDATEFAILED=0
++		Apt chroot update || UPDATEFAILED=1
++		if [ ${UPDATEFAILED} -eq 1 ]; then
++			Echo_warning "chroot_archives remove: apt-get update may have failed"
++		fi
+ 
+ 		# Cleaning apt package cache
+ 		rm -rf chroot/var/cache/apt
diff -Nru live-build-4.0.3/debian/patches/0011-Patch-so-that-chroot_dpkg-works-even-if-setenforce-1.patch live-build-4.0.3/debian/patches/0011-Patch-so-that-chroot_dpkg-works-even-if-setenforce-1.patch
--- live-build-4.0.3/debian/patches/0011-Patch-so-that-chroot_dpkg-works-even-if-setenforce-1.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/0011-Patch-so-that-chroot_dpkg-works-even-if-setenforce-1.patch	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,22 @@
+From: Frits Daalmans <frits@daalmansdata.eu>
+Date: Mon, 28 Dec 2015 16:54:56 +0100
+Subject: Patch so that chroot_dpkg works even if setenforce 1
+
+---
+ scripts/build/chroot_dpkg | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/build/chroot_dpkg b/scripts/build/chroot_dpkg
+index bd4a260..55f37d5 100755
+--- a/scripts/build/chroot_dpkg
++++ b/scripts/build/chroot_dpkg
+@@ -66,7 +66,8 @@ EOF
+ 		if [ -e /var/state/samhain/samhain_file ]
+ 		then
+ 			mv /var/state/samhain/samhain_file /var/state/samhain/samhain_file.orig
+-		else
++		elif [ -d /var/state ]
++		then
+ 			mkdir -p /var/state/samhain
+ 			touch /var/state/samhain/samhain_file
+ 		fi
diff -Nru live-build-4.0.3/debian/patches/0012-mksquashfs_xbcj_option.patch live-build-4.0.3/debian/patches/0012-mksquashfs_xbcj_option.patch
--- live-build-4.0.3/debian/patches/0012-mksquashfs_xbcj_option.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/0012-mksquashfs_xbcj_option.patch	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,41 @@
+From: Ozi Traveller <ozitraveller@gmail.com>
+Date: Wed, 3 Feb 2016 09:43:19 +0100
+Subject: mksquashfs_xbcj_option
+
+Added -Xbcj <architecture> option to mksquashfs in order to compress
+the filesystem better for that specific architecture.
+
+---
+ scripts/build/binary_rootfs | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
+index 4c13346..342b479 100755
+--- a/scripts/build/binary_rootfs
++++ b/scripts/build/binary_rootfs
+@@ -352,9 +352,24 @@ case "${LB_CHROOT_FILESYSTEM}" in
+ 			esac
+ 		fi
+ 
++		# squashfs has an option to compress for a specific architecture
++		# TODO FIXME map arm, armel, armhf architectures
++		# to -Xbcj options for arm and armthumb
++		case "${LIVE_IMAGE_ARCHITECTURE}" in
++			"i386"|"amd64") MKSQUASHFS_OPTION_XBCJ=" -Xbcj x86" ;;
++			"powerpc") MKSQUASHFS_OPTION_XBCJ=" -Xbcj powerpc" ;;
++			"sparc") MKSQUASHFS_OPTION_XBCJ=" -Xbcj sparc" ;;
++			"ia64") MKSQUASHFS_OPTION_XBCJ=" -Xbcj ia64" ;;
++			"any") MKSQUASHFS_OPTION_XBCJ="" ;;
++			*)
++				Echo_warning "binary_rootfs: Warning: no mksquashfs compression option configured for architecture ${LIVE_IMAGE_ARCHITECTURE}, squashfs image will be a bit larger"
++				MKSQUASHFS_OPTION_XBCJ=""
++				;;
++		esac
++
+ 		if [ "${LB_MODE}" != "ubuntu" ]
+ 		then
+-			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
++			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz "${MKSQUASHFS_OPTION_XBCJ}" -Xdict-size 75%"
+ 		fi
+ 
+ 		case "${LB_BUILD_WITH_CHROOT}" in
diff -Nru live-build-4.0.3/debian/patches/series live-build-4.0.3/debian/patches/series
--- live-build-4.0.3/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ live-build-4.0.3/debian/patches/series	2016-02-06 09:45:27.000000000 +0000
@@ -0,0 +1,12 @@
+0012-mksquashfs_xbcj_option.patch
+0001-minor-nitpick.patch
+0002-add-sysvinit-core-if-LB_INITSYSTEM-sysvinit.patch
+0003-New-option-use-original-packages-list-LB_BINARY_USE_.patch
+0004-Devuan-specific-changes-to-defaults-and-configuratio.patch
+0005-Use-the-debootstrap-exclude-option-if-LB_INITSYSTEM-.patch
+0006-Devuan-specific-modified-.udeb-package-path.patch
+0007-Devuan-specific-write-cdrom-.disk-base_exclude.patch
+0008-Workaround-to-find-firmware-packages.patch
+0009-Slightly-hacky-workarounds-for-when-Packages-is-unav.patch
+0010-merge-with-prev-patch.patch
+0011-Patch-so-that-chroot_dpkg-works-even-if-setenforce-1.patch