Merge ~raharper/curtin:fix/add-btrfs-progs-dep into curtin:master

[Ryan Harper]

debian/control: switch btrfs-tools to btrfs-progs

Don't use the transitional package name btrfs-tools, use
btrfs-progs.

LP: #1772618

[Ryan Harper (raharper)]

Note, on the release branches, btrfs-progs starts in bionic, so we'll need to patch this out on Xenial.

[Dan Watkins (oddbloke)]

review: Approve

[Chad Smith (chad.smith)]

Think Ryan mentioned tackling the runtime deps logic too.

814c325... by Ryan Harper on 2019-08-08

Also update the runtime package name

[Dan Watkins (oddbloke)]

review: Approve

[Dimitri John Ledkov (xnox)]

I think https://code.launchpad.net/~xnox/curtin/+git/curtin/+merge/371105 is better.

[Joshua Powers (powersj)]

I'm rejecting this one over the merge xnox commented about above.

Unmerged commits

814c325... by Ryan Harper on 2019-08-08

Also update the runtime package name

4762057... by Ryan Harper on 2019-08-02

debian/control: switch btrfs-tools to btrfs-progs

Don't use the transitional package name btrfs-tools, use
btrfs-progs.

LP: #1772618

diff --git a/curtin/deps/__init__.py b/curtin/deps/__init__.py
index 37c4469..3eacbc9 100644
--- a/curtin/deps/__init__.py
+++ b/curtin/deps/__init__.py
@@ -25,7 +25,7 @@ REQUIRED_EXECUTABLES = [
     ('lvcreate', 'lvm2'),
     ('mdadm', 'mdadm'),
     ('mkfs.vfat', 'dosfstools'),
-    ('mkfs.btrfs', 'btrfs-tools'),
+    ('mkfs.btrfs', 'btrfs-progs'),
     ('mkfs.ext4', 'e2fsprogs'),
     ('mkfs.xfs', 'xfsprogs'),
     ('partprobe', 'parted'),
diff --git a/debian/control b/debian/control
index c2de623..3cc763e 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Package: curtin
 Architecture: all
 Priority: extra
 Depends: bcache-tools,
-         btrfs-tools,
+         btrfs-progs,
          dosfstools,
          file,
          gdisk,