summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/customise.lib4
-rw-r--r--debian/changelog6
2 files changed, 9 insertions, 1 deletions
diff --git a/common/customise.lib b/common/customise.lib
index 3569acc..55307e9 100644
--- a/common/customise.lib
+++ b/common/customise.lib
@@ -30,6 +30,7 @@ EXTRA_PACKAGES="dkms locales whois telnet aptitude lsof host \
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 --git a/debian/changelog b/debian/changelog
index c8cd370..36859a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@debian.org> Wed, 19 Jul 2017 14:39:22 +0100
+
vmdebootstrap (1.7-1) unstable; urgency=medium
* New maintainer: Lars Wirzenius replaces Neil Williams.