Merge ~dbungert/curtin:cryptsetup-runtime into curtin:master

[Dan Bungert]

block: install cryptsetup if dm_crypt

Co-authored-by: J-P Nurmi <email address hidden>

[Dan Bungert (dbungert)]

vmtested for server, curtin does report wanting to install cryptsetup. Not really needed on server since ubuntu-server-minimal already has it.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:f5f580cf066e9813cb75778af29904c4b820c166
https://jenkins.canonical.com/server-team/job/curtin-ci/38/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/38/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/38/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/38/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/38/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/38//rebuild

review: Approve (continuous-integration)

[Michael Hudson-Doyle (mwhudson)]

Thanks

review: Approve

diff --git a/curtin/block/deps.py b/curtin/block/deps.py
index db449d8..5cb23e0 100644
--- a/curtin/block/deps.py
+++ b/curtin/block/deps.py
@@ -59,6 +59,7 @@ def detect_required_packages_mapping(osfamily=DISTROS.debian):
         DISTROS.debian: {
             'bcache': ['bcache-tools'],
             'btrfs': ['^btrfs-(progs|tools)$'],
+            'dm_crypt': ['cryptsetup'],
             'ext2': ['e2fsprogs'],
             'ext3': ['e2fsprogs'],
             'ext4': ['e2fsprogs'],
@@ -77,6 +78,7 @@ def detect_required_packages_mapping(osfamily=DISTROS.debian):
         DISTROS.redhat: {
             'bcache': [],
             'btrfs': ['btrfs-progs'],
+            'dm_crypt': ['cryptsetup'],
             'ext2': ['e2fsprogs'],
             'ext3': ['e2fsprogs'],
             'ext4': ['e2fsprogs'],