[Vmdebootstrap-devel] Bug#861069: tweaks for debian-live builds

[Steve McIntyre]

I've just upload an NMU with this patch applied. Here's the debdiff.



-- 
Steve McIntyre, Cambridge, UK.                                steve at einval.com
"Arguing that you don't care about the right to privacy because you have
 nothing to hide is no different than saying you don't care about free
 speech because you have nothing to say."
   -- Edward Snowden
-------------- next part --------------
diff -Nru vmdebootstrap-1.7/debian/changelog vmdebootstrap-1.7/debian/changelog
--- vmdebootstrap-1.7/debian/changelog	2016-09-11 15:07:37.000000000 +0000
+++ vmdebootstrap-1.7/debian/changelog	2017-07-19 13:39:21.000000000 +0000
@@ -1,3 +1,9 @@
+vmdebootstrap (1.7-1+nmu1) unstable; urgency=medium
+
+  * Add tweaks used for official debian-live builds. Closes: #861069
+
+ -- Steve McIntyre <93sam at debian.org>  Wed, 19 Jul 2017 14:39:22 +0100
+
 vmdebootstrap (1.7-1) unstable; urgency=medium
 
   * New maintainer: Lars Wirzenius replaces Neil Williams.
diff -Nru vmdebootstrap-1.7/debian/patches/customise-tweaks-debian-live.patch vmdebootstrap-1.7/debian/patches/customise-tweaks-debian-live.patch
--- vmdebootstrap-1.7/debian/patches/customise-tweaks-debian-live.patch	1970-01-01 00:00:00.000000000 +0000
+++ vmdebootstrap-1.7/debian/patches/customise-tweaks-debian-live.patch	2017-07-19 13:39:22.000000000 +0000
@@ -0,0 +1,25 @@
+   * Add tweaks used for official debian-live builds. Closes: #861069
+Author: Steve McIntyre <93sam at debian.org>
+Bug-Debian: https://bugs.debian.org/861069
+Last-Update: 2017-07-19
+
+--- vmdebootstrap-1.7.orig/common/customise.lib
++++ vmdebootstrap-1.7/common/customise.lib
+@@ -30,6 +30,7 @@ EXTRA_PACKAGES="dkms locales whois telne
+  ethtool ftp host lsof debian-faq debian-installer-launcher doc-debian \
+ "
+ cleanup() {
++    umount ${rootdir}/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true
+     umount ${rootdir}/proc
+     umount ${rootdir}/sys
+ }
+@@ -59,7 +60,8 @@ prepare_apt_source() {
+     # handle the apt source
+     mv ${rootdir}/etc/apt/sources.list.d/base.list ${rootdir}/etc/apt/
+     echo "deb $1 $2 main contrib non-free" > ${rootdir}/etc/apt/sources.list
+-    chroot ${rootdir} apt update
++    echo "deb-src $1 $2 main contrib non-free" >> ${rootdir}/etc/apt/sources.list
++    chroot ${rootdir} apt -qq -y update > /dev/null 2>&1
+ }
+ 
+ remove_daemon_block() {
diff -Nru vmdebootstrap-1.7/debian/patches/series vmdebootstrap-1.7/debian/patches/series
--- vmdebootstrap-1.7/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ vmdebootstrap-1.7/debian/patches/series	2017-07-19 13:39:22.000000000 +0000
@@ -0,0 +1 @@
+customise-tweaks-debian-live.patch