[Piuparts-commits] [piuparts] 03/14: p: run debootstrap with --no-merged-usr

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit bfae3e0da0a554477033c882eddee9f3319ebc10
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Aug 14 06:08:47 2017 +0200

    p: run debootstrap with --no-merged-usr
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 piuparts.py      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 256ecbd..ff23b17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ piuparts (0.79) UNRELEASED; urgency=medium
       break piuparts.
     - Silence diff_meta_data() for "others" for --warn-on-others.
     - Let debsums always ignore obsolete conffiles.
+    - Run debootstrap with --no-merged-usr.
   * piuparts.conf:
     - Use relative expiration ages.
   * piuparts.conf.anbe: Add some more example sections.
diff --git a/debian/control b/debian/control
index 09c9bd1..5ae489e 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Pre-Depends:
  dpkg (>= 1.15.7.2~),
 Depends:
  piuparts-common (= ${binary:Version}),
- debootstrap,
+ debootstrap (>= 1.0.89~),
  debsums (>= 2.2.2~),
  lsb-release,
  lsof,
diff --git a/piuparts.py b/piuparts.py
index cb8428f..355a948 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1061,6 +1061,7 @@ class Chroot:
             options.append("--keyring=%s" % settings.keyring)
         if settings.eatmydata:
             options.append('--include=eatmydata')
+        options.append('--no-merged-usr')
         options.append('--components=%s' % ','.join(settings.debian_mirrors[0][1]))
         if settings.arch:
             options.append('--arch=%s' % settings.arch)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git