diff options
| author | Lars Wirzenius <liw@liw.fi> | 2017-09-17 16:20:47 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2017-09-17 16:20:47 +0300 |
| commit | 9abdc87e39962322ad9e4dc5dfa9140b578bb61b (patch) | |
| tree | 6c0168c89b34a983a9a8be25b0880ec121dc9d7f | |
| parent | 1ba2ae653fefe8076a6ee7d2df7b555e0dbdd607 (diff) | |
| parent | 597f7ded87c98b41c781847c78210456897d2248 (diff) | |
| download | vmdebootstrap-9abdc87e39962322ad9e4dc5dfa9140b578bb61b.tar.gz | |
Merge branch 'liw/nmu1'
Include Steve's 1.7-1+nmu1 changes.
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | common/customise.lib | 4 | ||||
| -rw-r--r-- | debian/changelog | 8 |
3 files changed, 17 insertions, 3 deletions
@@ -1,9 +1,15 @@ NEWS for vmdebootstrap ====================== -Version 1.7+git, not yet released +Version 1.8+git, not yet released +----------------------------------------------------------------------------- + +* To be filled in later. + +Version 1.7-1, released 2016-09-11 --------------------------------- +* NMUs by Steve McIntyre. Bug fixes. Version 1.7, released 2016-09-11 --------------------------------- 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 67c8ba9..abff3b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vmdebootstrap (1.7+git-1) UNRELEASED; urgency=medium +vmdebootstrap (1.8+git-1) UNRELEASED; urgency=medium * New upstream version. * debian/control: Drop Antonio from Uploaders, by request. @@ -6,6 +6,12 @@ vmdebootstrap (1.7+git-1) UNRELEASED; urgency=medium -- Lars Wirzenius <liw@liw.fi> Sun, 11 Sep 2016 18:07:38 +0300 +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. |