Merge/sync debootstrap from Debian Sid

[Simon Quigley]

There are two notable changes from Debian in our debootstrap packaging:

debootstrap (1.0.106ubuntu2+really1.0.97ubuntu1) cosmic; urgency=medium

  * Revert to last known good version to avoid bugs like
    https://bugs.debian.org/903481. Careful testing will be needed before
    we merge again.

 -- Michael Hudson-Doyle <email address hidden> Thu, 12 Jul 2018 12:01:58 +1200

debootstrap (1.0.106ubuntu1) cosmic; urgency=medium

  * debootstrap does not make a destinction between priviledged and
    unpriviledged lxd containers. When setting up devices, try to use the
    old simple device setup, and if that fails, then fallback to the new
    bind-setup. Blind attempt to unbreak cloud image livefs building, as
    PPA is failing to build this package for me, thus cannot self-trigger
    a livefs build to test this before uploading.

 -- Dimitri John Ledkov 🌈 <email address hidden> Fri, 06 Jul 2018 12:32:07 +0100

---

Here's the most recent changelog from Debian:

debootstrap (1.0.107) unstable; urgency=medium

  [ Patrick McDermott ]
  * Fix wgetprogress() with --debian-installer (Closes: #829725)

  [ Dan Nicholson ]
  * Strip URL scheme from apt lists (Closes: #903481)

  [ Hideki Yamane ]
  * Fix docker detection breaks QEMU's binfmt_misc bootstraping
    (Closes: #903657)
    - Avoid removing host's /proc on some environment
    - Add workaround for second-stage inside docker
  * Align scripts/gutsy to scripts/debian-common
  * Remove unnecessary script files from udeb package
    (Closes: #618839, #893713)

 -- Hideki Yamane <email address hidden> Thu, 26 Jul 2018 19:12:20 +0900

---

It fixes the bug Michael mentioned, but as he stated, careful testing is needed before we merge again.

I am volunteering to drive this, but I would like to track testing in this bug to make sure nothing is broken before we do this merge.

Assuming Dimitri upstreams his changes to Debian, I would also like to raise attention to this: should we add it to the sync blacklist or keep a permanent delta which is only a changelog entry? If it is going to be problematic, proper testing is surely needed to make sure it doesn't break again, but should action be taken to make that an extra step?

Thanks.

[Simon Quigley (tsimonq2)]

Adding block-proposed, so if someone doesn't see this bug and decides to go ahead anyway, they'll have to look here.

[Michael Hudson-Doyle (mwhudson)]

I have no great problem with syncing in general. We've just had a bunch of issues this cycle and the motivation level for dealing with more is low -- if you want to drive this, no objections from me!

[Hideki Yamane (henrich)]

Hi,

Anyway, please mention your problem to Debian BTS or <email address hidden>.
I'm not sure what is the problem on Ubuntu side and don't know how to reproduce it...

Please, please share it.

[Dimitri John Ledkov (xnox)]

debootstrap has delta in ubuntu, from time to time, which is normal. And is synced back from time to time.

I don't believe cosmic will be able to be in sync, but 19.04 might.

there is no need to add any blacklists, as this package operates normally as per usual merge process anyway.

[Dimitri John Ledkov (xnox)]

cpc minimal images build correctly.

my fixes are merged upstream.

need to demote arch-test, uploading a fork based off unreleased 1.0.109.