Merge ~raharper/curtin:ubuntu/xenial-sru-20200130 into curtin:ubuntu/xenial

[Ryan Harper]

[Dan Watkins (oddbloke)]

Confirmed that I see the same locally.

review: Approve

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

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/378357/+edit-commit-message
https://jenkins.ubuntu.com/server/job/curtin-ci/3823/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/3823/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/3823/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/3823/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/3823/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/3823//rebuild

review: Needs Fixing (continuous-integration)

diff --git a/HACKING.rst b/HACKING.rst
index d87552b..7c26a25 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -15,12 +15,11 @@ Do these things once
   be listed in the `contributor-agreement-canonical`_ group.  Unfortunately
   there is no easy way to check if an organization or company you are doing
   work for has signed.  If you are unsure or have questions, email
-  `Scott Moser <mailto:[e-mail]>`_ and
-  `Ryan Harper <mailto:[e-mail]>`_ or ping smoser or rharper
-  in ``#curtin`` channel via Freenode IRC.
+  `Josh Powers <mailto:[e-mail]>` or ping powersj in
+  ``#curtin`` channel via Freenode IRC.
 
   When prompted for 'Project contact' or 'Canonical Project Manager' enter
-  'David Britton'.
+  'Josh Powers'.
 
 * Configure git with your email and name for commit messages.
 
diff --git a/Makefile b/Makefile
index 25db1d0..827102c 100644
--- a/Makefile
+++ b/Makefile
@@ -31,10 +31,14 @@ pyflakes:
 pyflakes3:
 	@$(CWD)/tools/run-pyflakes3
 
-unittest:
+unittest2:
 	nosetests $(coverageopts) $(noseopts) tests/unittests
+
+unittest3:
 	nosetests3 $(coverageopts) $(noseopts) tests/unittests
 
+unittest: unittest2 unittest3
+
 schema-validate:
 	@$(CWD)/tools/schema-validate-storage
 
diff --git a/curtin/__init__.py b/curtin/__init__.py
index 076c135..142d288 100644
--- a/curtin/__init__.py
+++ b/curtin/__init__.py
@@ -32,6 +32,6 @@ FEATURES = [
     'HAS_VERSION_MODULE',
 ]
 
-__version__ = "19.1"
+__version__ = "19.3"
 
 # vi: ts=4 expandtab syntax=python
diff --git a/curtin/block/__init__.py b/curtin/block/__init__.py
index 5d1b1bd..f30c5df 100644
--- a/curtin/block/__init__.py
+++ b/curtin/block/__init__.py
@@ -668,6 +668,24 @@ def get_proc_mounts():
     return mounts
 
 
+def _get_dev_disk_by_prefix(prefix):
+    """
+    Construct a dictionary mapping devname to disk/<prefix> paths
+
+    :returns: Dictionary populated by examining /dev/disk/<prefix>/*
+
+    {
+     '/dev/sda': '/dev/disk/<prefix>/virtio-aaaa',
+     '/dev/sda1': '/dev/disk/<prefix>/virtio-aaaa-part1',
+    }
+    """
+    return {
+        os.path.realpath(bypfx): bypfx
+        for bypfx in [os.path.join(prefix, path)
+                      for path in os.listdir(prefix)]
+    }
+
+
 def get_dev_disk_byid():
     """
     Construct a dictionary mapping devname to disk/by-id paths
@@ -679,12 +697,7 @@ def get_dev_disk_byid():
      '/dev/sda1': '/dev/disk/by-id/virtio-aaaa-part1',
     }
     """
-
-    prefix = '/dev/disk/by-id'
-    return {
-        os.path.realpath(byid): byid
-        for byid in [os.path.join(prefix, path) for path in os.listdir(prefix)]
-    }
+    return _get_dev_disk_by_prefix('/dev/disk/by-id')
 
 
 def disk_to_byid_path(kname):
@@ -696,6 +709,15 @@ def disk_to_byid_path(kname):
     return mapping.get(dev_path(kname))
 
 
+def disk_to_bypath_path(kname):
+    """"
+    Return a /dev/disk/by-path path to kname if present.
+    """
+
+    mapping = _get_dev_disk_by_prefix('/dev/disk/by-path')
+    return mapping.get(dev_path(kname))
+
+
 def get_device_mapper_links(devpath, first=False):
     """ Return the best devlink to device at devpath. """
     info = udevadm_info(devpath)
@@ -892,6 +914,28 @@ def is_online(device):
     return int(device_size) > 0
 
 
+def zkey_supported(strict=True):
+    """ Return True if zkey cmd present and can generate keys, else False."""
+    LOG.debug('Checking if zkey encryption is supported...')
+    try:
+        util.load_kernel_module('pkey')
+    except util.ProcessExecutionError as err:
+        msg = "Failed to load 'pkey' kernel module"
+        LOG.error(msg + ": %s" % err) if strict else LOG.warning(msg)
+        return False
+
+    try:
+        with tempfile.NamedTemporaryFile() as tf:
+            util.subp(['zkey', 'generate', tf.name], capture=True)
+            LOG.debug('zkey encryption supported.')
+            return True
+    except util.ProcessExecutionError as err:
+        msg = "zkey not supported"
+        LOG.error(msg + ": %s" % err) if strict else LOG.warning(msg)
+
+    return False
+
+
 @contextmanager
 def exclusive_open(path, exclusive=True):
     """
diff --git a/curtin/block/clear_holders.py b/curtin/block/clear_holders.py
index 4a099cd..b691841 100644
--- a/curtin/block/clear_holders.py
+++ b/curtin/block/clear_holders.py
@@ -166,14 +166,27 @@ def shutdown_mdadm(device):
 
     blockdev = block.sysfs_to_devpath(device)
 
-    LOG.info('Wiping superblock on raid device: %s', device)
-    _wipe_superblock(blockdev, exclusive=False)
-
+    LOG.info('Discovering raid devices and spares for %s', device)
     md_devs = (
         mdadm.md_get_devices_list(blockdev) +
         mdadm.md_get_spares_list(blockdev))
     mdadm.set_sync_action(blockdev, action="idle")
     mdadm.set_sync_action(blockdev, action="frozen")
+
+    LOG.info('Wiping superblock on raid device: %s', device)
+    try:
+        _wipe_superblock(blockdev, exclusive=False)
+    except ValueError as e:
+        # if the array is not functional, writes to the device may fail
+        # and _wipe_superblock will raise ValueError for short writes
+        # which happens on inactive raid volumes.  In that case we
+        # shouldn't give up yet as we still want to disassemble
+        # array and wipe members.  Other errors such as IOError or OSError
+        # are unwelcome and will stop deployment.
+        LOG.debug('Non-fatal error writing to array device %s, '
+                  'proceeding with shutdown: %s', blockdev, e)
+
+    LOG.info('Removing raid array members: %s', md_devs)
     for mddev in md_devs:
         try:
             mdadm.fail_device(blockdev, mddev)
@@ -272,7 +285,26 @@ def wipe_superblock(device):
             else:
                 bcache._stop_device(stop_path)
 
-    _wipe_superblock(blockdev)
+    # the blockdev (e.g. /dev/sda2) may be a multipath partition which can
+    # only be wiped via its device mapper device (e.g. /dev/dm-4)
+    # check for this and determine the correct device mapper value to use.
+    mp_dev = None
+    mp_support = multipath.multipath_supported()
+    if mp_support:
+        parent, partnum = block.get_blockdev_for_partition(blockdev)
+        parent_mpath_id = multipath.find_mpath_id_by_path(parent)
+        if parent_mpath_id is not None:
+            # construct multipath dmsetup id
+            # <mpathid>-part%d -> /dev/dm-1
+            mp_id, mp_dev = multipath.find_mpath_id_by_parent(parent_mpath_id,
+                                                              partnum=partnum)
+            # if we don't find a mapping then the mp partition has already been
+            # wiped/removed
+            if mp_dev:
+                LOG.debug('Found multipath device over %s, wiping holder %s',
+                          blockdev, mp_dev)
+
+    _wipe_superblock(mp_dev if mp_dev else blockdev)
 
     # if we had partitions, make sure they've been removed
     if partitions:
@@ -295,16 +327,19 @@ def wipe_superblock(device):
                       device, attempt + 1, len(retries), wait)
             time.sleep(wait)
 
-    # multipath partitions are separate block devices (disks)
-    if multipath.is_mpath_partition(blockdev):
-        multipath.remove_partition(blockdev)
-    # multipath devices must be hidden to utilize a single member (path)
-    elif multipath.is_mpath_device(blockdev):
-        mp_id = multipath.find_mpath_id(blockdev)
-        if mp_id:
-            multipath.remove_map(mp_id)
-        else:
-            raise RuntimeError('Failed to find multipath id for %s' % blockdev)
+    if mp_support:
+        # multipath partitions are separate block devices (disks)
+        if mp_dev or multipath.is_mpath_partition(blockdev):
+            multipath.remove_partition(mp_dev if mp_dev else blockdev)
+        # multipath devices must be hidden to utilize a single member (path)
+        elif multipath.is_mpath_device(blockdev):
+            mp_id = multipath.find_mpath_id(blockdev)
+            multipath.remove_partition(blockdev)
+            if mp_id:
+                multipath.remove_map(mp_id)
+            else:
+                raise RuntimeError(
+                    'Failed to find multipath id for %s' % blockdev)
 
 
 def _wipe_superblock(blockdev, exclusive=True, strict=True):
@@ -456,25 +491,39 @@ def plan_shutdown_holder_trees(holders_trees):
     if not isinstance(holders_trees, (list, tuple)):
         holders_trees = [holders_trees]
 
+    # sort the trees to ensure we generate a consistent plan
+    holders_trees = sorted(holders_trees, key=lambda x: x['device'])
+
+    def htree_level(tree):
+        if len(tree['holders']) == 0:
+            return 0
+        return 1 + sum(htree_level(holder) for holder in tree['holders'])
+
     def flatten_holders_tree(tree, level=0):
         """
         add entries from holders tree to registry with level key corresponding
         to how many layers from raw disks the current device is at
         """
         device = tree['device']
+        device_level = htree_level(tree)
 
         # always go with highest level if current device has been
         # encountered already. since the device and everything above it is
         # re-added to the registry it ensures that any increase of level
         # required here will propagate down the tree
         # this handles a scenario like mdadm + bcache, where the backing
-        # device for bcache is a 3nd level item like mdadm, but the cache
+        # device for bcache is a 3rd level item like mdadm, but the cache
         # device is 1st level (disk) or second level (partition), ensuring
         # that the bcache item is always considered higher level than
         # anything else regardless of whether it was added to the tree via
         # the cache device or backing device first
         if device in reg:
-            level = max(reg[device]['level'], level)
+            level = max(reg[device]['level'], level) + 1
+
+        else:
+            # first time device to registry, assume the larger value of the
+            # current level or the length of its dependencies.
+            level = max(device_level, level)
 
         reg[device] = {'level': level, 'device': device,
                        'dev_type': tree['dev_type']}
@@ -487,10 +536,26 @@ def plan_shutdown_holder_trees(holders_trees):
     for holders_tree in holders_trees:
         flatten_holders_tree(holders_tree)
 
-    # return list of entry dicts with highest level first, then dev_type
+    def devtype_order(dtype):
+        """Return the order in which we want to clear device types, higher
+         value should be cleared first.
+
+        :param: dtype: string. A device types name from the holders registry,
+                see _define_handlers_registry()
+        :returns: integer
+        """
+        dev_type_order = [
+            'disk', 'partition', 'bcache', 'lvm', 'raid', 'crypt']
+        return 1 + dev_type_order.index(dtype)
+
+    # return list of entry dicts with greatest htree depth. The 'level' value
+    # indicates the number of additional devices that are "below" this device.
+    # Devices must be cleared in descending 'level' value.  For devices which
+    # have the same 'level' value, we sort within the 'level' by devtype order.
     return [reg[k]
-            for k in sorted(reg, key=lambda x: (reg[x]['level'] * -1,
-                                                reg[x]['dev_type']))]
+            for k in sorted(reg, reverse=True,
+                            key=lambda x: (reg[x]['level'],
+                                           devtype_order(reg[x]['dev_type'])))]
 
 
 def format_holders_tree(holders_tree):
@@ -534,8 +599,10 @@ def assert_clear(base_paths):
     valid = ('disk', 'partition')
     if not isinstance(base_paths, (list, tuple)):
         base_paths = [base_paths]
-    base_paths = [block.sys_block_path(path) for path in base_paths]
-    for holders_tree in [gen_holders_tree(p) for p in base_paths]:
+    base_paths = [block.sys_block_path(path, strict=False)
+                  for path in base_paths]
+    for holders_tree in [gen_holders_tree(p)
+                         for p in base_paths if os.path.exists(p)]:
         if any(holder_type not in valid and path not in base_paths
                for (holder_type, path) in get_holder_types(holders_tree)):
             raise OSError('Storage not clear, remaining:\n{}'
diff --git a/curtin/block/deps.py b/curtin/block/deps.py
index 930f764..38581a8 100644
--- a/curtin/block/deps.py
+++ b/curtin/block/deps.py
@@ -58,7 +58,7 @@ def detect_required_packages_mapping(osfamily=DISTROS.debian):
     distro_mapping = {
         DISTROS.debian: {
             'bcache': ['bcache-tools'],
-            'btrfs': ['btrfs-tools'],
+            'btrfs': ['^btrfs-(progs|tools)$'],
             'ext2': ['e2fsprogs'],
             'ext3': ['e2fsprogs'],
             'ext4': ['e2fsprogs'],
diff --git a/curtin/block/multipath.py b/curtin/block/multipath.py
index d1e8441..8ce0509 100644
--- a/curtin/block/multipath.py
+++ b/curtin/block/multipath.py
@@ -11,6 +11,7 @@ SHOW_MAPS_FMT = "name=%n multipath='%w' sysfs='%d' paths='%N'"
 
 
 def _extract_mpath_data(cmd, show_verb):
+    """ Parse output from specifed command output via load_shell_content."""
     data, _err = util.subp(cmd, capture=True)
     result = []
     for line in data.splitlines():
@@ -23,16 +24,34 @@ def _extract_mpath_data(cmd, show_verb):
 
 
 def show_paths():
+    """ Query multipathd for paths output and return a dict of the values."""
     cmd = ['multipathd', 'show', 'paths', 'raw', 'format', SHOW_PATHS_FMT]
     return _extract_mpath_data(cmd, 'paths')
 
 
 def show_maps():
+    """ Query multipathd for maps output and return a dict of the values."""
     cmd = ['multipathd', 'show', 'maps', 'raw', 'format', SHOW_MAPS_FMT]
     return _extract_mpath_data(cmd, 'maps')
 
 
+def dmname_to_blkdev_mapping():
+    """ Use dmsetup ls output to build a dict of DM_NAME, /dev/dm-x values."""
+    data, _err = util.subp(['dmsetup', 'ls', '-o', 'blkdevname'], capture=True)
+    mapping = {}
+    if data and data.strip() != "No devices found":
+        LOG.debug('multipath: dmsetup ls output:\n%s', data)
+        for line in data.splitlines():
+            if line:
+                dm_name, blkdev = line.split('\t')
+                # (dm-1) -> /dev/dm-1
+                mapping[dm_name] = '/dev/' + blkdev.strip('()')
+
+    return mapping
+
+
 def is_mpath_device(devpath):
+    """ Check if devpath is a multipath device, returns boolean. """
     info = udev.udevadm_info(devpath)
     if info.get('DM_UUID', '').startswith('mpath-'):
         return True
@@ -41,6 +60,7 @@ def is_mpath_device(devpath):
 
 
 def is_mpath_member(devpath):
+    """ Check if a device is a multipath member (a path), returns boolean. """
     try:
         util.subp(['multipath', '-c', devpath], capture=True)
         return True
@@ -49,6 +69,7 @@ def is_mpath_member(devpath):
 
 
 def is_mpath_partition(devpath):
+    """ Check if a device is a multipath partition, returns boolean. """
     if devpath.startswith('/dev/dm-'):
         if 'DM_PART' in udev.udevadm_info(devpath):
             LOG.debug("%s is multipath device partition", devpath)
@@ -58,6 +79,7 @@ def is_mpath_partition(devpath):
 
 
 def mpath_partition_to_mpath_id(devpath):
+    """ Return the mpath id of a multipath partition. """
     info = udev.udevadm_info(devpath)
     if 'DM_MPATH' in info:
         return info['DM_MPATH']
@@ -66,9 +88,10 @@ def mpath_partition_to_mpath_id(devpath):
 
 
 def remove_partition(devpath, retries=10):
+    """ Remove a multipath partition mapping. """
     LOG.debug('multipath: removing multipath partition: %s', devpath)
     for _ in range(0, retries):
-        util.subp(['dmsetup', 'remove', devpath], rcs=[0, 1])
+        util.subp(['dmsetup', 'remove', '--force', '--retry', devpath])
         udev.udevadm_settle()
         if not os.path.exists(devpath):
             return
@@ -77,10 +100,11 @@ def remove_partition(devpath, retries=10):
 
 
 def remove_map(map_id, retries=10):
+    """ Remove a multipath device mapping. """
     LOG.debug('multipath: removing multipath map: %s', map_id)
     devpath = '/dev/mapper/%s' % map_id
     for _ in range(0, retries):
-        util.subp(['multipath', '-f', map_id], rcs=[0, 1])
+        util.subp(['multipath', '-v3', '-R3', '-f', map_id], rcs=[0, 1])
         udev.udevadm_settle()
         if not os.path.exists(devpath):
             return
@@ -89,6 +113,7 @@ def remove_map(map_id, retries=10):
 
 
 def find_mpath_members(multipath_id, paths=None):
+    """ Return a list of device path for each member of aspecified mpath_id."""
     if not paths:
         paths = show_paths()
 
@@ -98,6 +123,7 @@ def find_mpath_members(multipath_id, paths=None):
 
 
 def find_mpath_id(devpath, maps=None):
+    """ Return the mpath_id associated with a specified device path. """
     if not maps:
         maps = show_maps()
 
@@ -109,3 +135,49 @@ def find_mpath_id(devpath, maps=None):
             return mpmap['multipath']
 
     return None
+
+
+def find_mpath_id_by_path(devpath, paths=None):
+    """ Return the mpath_id associated with a specified device path. """
+    if not paths:
+        paths = show_paths()
+
+    for path in paths:
+        if devpath == '/dev/' + path['device']:
+            return path['multipath']
+
+    return None
+
+
+def find_mpath_id_by_parent(multipath_id, partnum=None):
+    """ Return the mpath_id associated with a specified device path. """
+    devmap = dmname_to_blkdev_mapping()
+    LOG.debug('multipath: dm_name blk map: %s', devmap)
+    dm_name = multipath_id
+    if partnum:
+        dm_name += "-part%d" % int(partnum)
+
+    return (dm_name, devmap.get(dm_name))
+
+
+def multipath_supported():
+    """Return a boolean indicating if multipath is supported."""
+    try:
+        multipath_assert_supported()
+        return True
+    except RuntimeError:
+        return False
+
+
+def multipath_assert_supported():
+    """ Determine if the runtime system supports multipath.
+    returns: True if system supports multipath
+    raises: RuntimeError: if system does not support multipath
+    """
+    missing_progs = [p for p in ('multipath', 'multipathd')
+                     if not util.which(p)]
+    if missing_progs:
+        raise RuntimeError(
+            "Missing multipath utils: %s" % ','.join(missing_progs))
+
+# vi: ts=4 expandtab syntax=python
diff --git a/curtin/block/schemas.py b/curtin/block/schemas.py
index fb7507d..fc7e522 100644
--- a/curtin/block/schemas.py
+++ b/curtin/block/schemas.py
@@ -7,6 +7,8 @@ _path_nondev = r'(^/$|^(/[^/]+)+$)'
 _fstypes = ['btrfs', 'ext2', 'ext3', 'ext4', 'fat', 'fat12', 'fat16', 'fat32',
             'iso9660', 'vfat', 'jfs', 'ntfs', 'reiserfs', 'swap', 'xfs',
             'zfsroot']
+_ptables = ['dos', 'gpt', 'msdos', 'vtoc']
+_ptable_unsupported = 'unsupported'
 
 definitions = {
     'id': {'type': 'string'},
@@ -14,7 +16,7 @@ definitions = {
     'devices': {'type': 'array', 'items': {'$ref': '#/definitions/ref_id'}},
     'name': {'type': 'string'},
     'preserve': {'type': 'boolean'},
-    'ptable': {'type': 'string', 'enum': ['dos', 'gpt', 'msdos']},
+    'ptable': {'type': 'string', 'enum': _ptables + [_ptable_unsupported]},
     'size': {'type': ['string', 'number'],
              'minimum': 1,
              'pattern': r'^([1-9]\d*(.\d+)?|\d+.\d+)(K|M|G|T)?B?'},
@@ -119,6 +121,7 @@ DISK = {
     'properties': {
         'id': {'$ref': '#/definitions/id'},
         'name': {'$ref': '#/definitions/name'},
+        'multipath': {'type': 'string'},
         'preserve': {'$ref': '#/definitions/preserve'},
         'wipe': {'$ref': '#/definitions/wipe'},
         'type': {'const': 'disk'},
@@ -135,7 +138,7 @@ DISK = {
             'type': 'string',
             'oneOf': [
                 {'pattern': r'^0x(\d|[a-zA-Z])+'},
-                {'pattern': r'^nvme\.(\d|[a-zA-Z]-)+'}],
+                {'pattern': r'^(nvme|eui)\.([-0-9a-zA-Z])+'}],
         },
         'grub_device': {
             'type': ['boolean', 'integer'],
@@ -265,6 +268,7 @@ PARTITION = {
     'additionalProperties': False,
     'properties': {
         'id': {'$ref': '#/definitions/id'},
+        'multipath': {'type': 'string'},
         'name': {'$ref': '#/definitions/name'},
         'offset': {'$ref': '#/definitions/size'},  # XXX: This is not used
         'preserve': {'$ref': '#/definitions/preserve'},
@@ -296,6 +300,8 @@ RAID = {
         'devices': {'$ref': '#/definitions/devices'},
         'name': {'$ref': '#/definitions/name'},
         'mdname': {'$ref': '#/definitions/name'},  # XXX: Docs need updating
+        'metadata': {'type': ['string', 'number']},
+        'preserve': {'$ref': '#/definitions/preserve'},
         'ptable': {'$ref': '#/definitions/ptable'},
         'spare_devices': {'$ref': '#/definitions/devices'},
         'type': {'const': 'raid'},
diff --git a/curtin/block/zfs.py b/curtin/block/zfs.py
index dce15c3..25751d3 100644
--- a/curtin/block/zfs.py
+++ b/curtin/block/zfs.py
@@ -281,4 +281,28 @@ def device_to_poolname(devname):
     if vdev_type == 'zfs_member' and label:
         return label
 
+
+def get_zpool_from_config(cfg):
+    """Parse a curtin storage config and return a list
+       of zpools that were created.
+    """
+    if not cfg:
+        return []
+
+    if 'storage' not in cfg:
+        return []
+
+    zpools = []
+    sconfig = cfg['storage']['config']
+    for item in sconfig:
+        if item['type'] == 'zpool':
+            zpools.append(item['pool'])
+        elif item['type'] == 'format':
+            if item['fstype'] == 'zfsroot':
+                # curtin.commands.blockmeta sets pool='rpool' for zfsroot
+                zpools.append('rpool')
+
+    return zpools
+
+
 # vi: ts=4 expandtab syntax=python
diff --git a/curtin/commands/block_meta.py b/curtin/commands/block_meta.py
index 79493fc..f287bd4 100644
--- a/curtin/commands/block_meta.py
+++ b/curtin/commands/block_meta.py
@@ -2,6 +2,7 @@
 
 from collections import OrderedDict, namedtuple
 from curtin import (block, config, paths, util)
+from curtin.block import schemas
 from curtin.block import (bcache, clear_holders, dasd, iscsi, lvm, mdadm, mkfs,
                           zfs)
 from curtin import distro
@@ -32,6 +33,7 @@ SIMPLE = 'simple'
 SIMPLE_BOOT = 'simple-boot'
 CUSTOM = 'custom'
 BCACHE_REGISTRATION_RETRY = [0.2] * 60
+PTABLE_UNSUPPORTED = schemas._ptable_unsupported
 
 CMD_ARGUMENTS = (
     ((('-D', '--devices'),
@@ -58,7 +60,7 @@ CMD_ARGUMENTS = (
 @logged_time("BLOCK_META")
 def block_meta(args):
     # main entry point for the block-meta command.
-    state = util.load_command_environment()
+    state = util.load_command_environment(strict=True)
     cfg = config.load_command_config(args, state)
     dd_images = util.get_dd_images(cfg.get('sources', {}))
 
@@ -67,7 +69,7 @@ def block_meta(args):
     if devices is None:
         devices = []
         if 'storage' in cfg:
-            devices = get_disk_paths_from_storage_config(
+            devices = get_device_paths_from_storage_config(
                 extract_storage_ordered_dict(cfg))
         if len(devices) == 0:
             devices = cfg.get('block-meta', {}).get('devices', [])
@@ -258,7 +260,7 @@ def make_dname_byid(path, error_msg=None, info=None):
 
 
 def make_dname(volume, storage_config):
-    state = util.load_command_environment()
+    state = util.load_command_environment(strict=True)
     rules_dir = os.path.join(state['scratch'], "rules.d")
     vol = storage_config.get(volume)
     path = get_path_to_storage_volume(volume, storage_config)
@@ -404,9 +406,8 @@ def get_path_to_storage_volume(volume, storage_config):
             try:
                 if not vol_value:
                     continue
-                if disk_key == 'serial':
+                if disk_key in ['wwn', 'serial']:
                     volume_path = block.lookup_disk(vol_value)
-                    break
                 elif disk_key == 'path':
                     if vol_value.startswith('iscsi:'):
                         i = iscsi.ensure_disk_connected(vol_value)
@@ -416,21 +417,18 @@ def get_path_to_storage_volume(volume, storage_config):
                         # sys/class/block access is valid.  ie, there are no
                         # udev generated values in sysfs
                         volume_path = os.path.realpath(vol_value)
-                    break
-                elif disk_key == 'wwn':
-                    by_wwn = '/dev/disk/by-id/wwn-%s' % vol.get('wwn')
-                    volume_path = os.path.realpath(by_wwn)
-                    break
                 elif disk_key == 'device_id':
                     dasd_device = dasd.DasdDevice(vol_value)
                     volume_path = dasd_device.devname
-                    break
             except ValueError:
-                pass
+                continue
+            # verify path exists otherwise try the next key
+            if not os.path.exists(volume_path):
+                volume_path = None
 
-        if not volume_path:
-            raise ValueError("serial, wwn or path to block dev must be \
-                specified to identify disk")
+        if volume_path is None:
+            raise ValueError("Failed to find storage volume id='%s' config: %s"
+                             % (vol['id'], vol))
 
     elif vol.get('type') == "lvm_partition":
         # For lvm partitions, a directory in /dev/ should be present with the
@@ -536,7 +534,7 @@ def disk_handler(info, storage_config):
 
     if config.value_as_boolean(info.get('preserve')):
         # Handle preserve flag, verifying if ptable specified in config
-        if config.value_as_boolean(ptable):
+        if config.value_as_boolean(ptable) and ptable != PTABLE_UNSUPPORTED:
             current_ptable = block.get_part_table_type(disk)
             if not ((ptable in _dos_names and current_ptable in _dos_names) or
                     (ptable == 'gpt' and current_ptable == 'gpt')):
@@ -868,6 +866,47 @@ def mount_data(info, storage_config):
         spec, path, fstype, ",".join(options), freq, passno, volume_path)
 
 
+def _get_volume_type(device_path):
+    lsblock = block._lsblock([device_path])
+    kname = block.path_to_kname(device_path)
+    return lsblock[kname]['TYPE']
+
+
+def get_volume_spec(device_path):
+    """
+       Return the most reliable spec for a device per Ubuntu FSTAB wiki
+
+       https://wiki.ubuntu.com/FSTAB
+    """
+    info = udevadm_info(path=device_path)
+    block_type = _get_volume_type(device_path)
+
+    devlinks = []
+    if 'raid' in block_type:
+        devlinks = [link for link in info['DEVLINKS']
+                    if os.path.basename(link).startswith('md-uuid-')]
+    elif block_type in ['crypt', 'lvm', 'mpath']:
+        devlinks = [link for link in info['DEVLINKS']
+                    if os.path.basename(link).startswith('dm-uuid-')]
+    elif block_type in ['disk', 'part']:
+        if device_path.startswith('/dev/bcache'):
+            devlinks = [link for link in info['DEVLINKS']
+                        if link.startswith('/dev/bcache/by-uuid')]
+        # on s390x prefer by-path links which are stable and unique.
+        if platform.machine() == 's390x':
+            devlinks = [link for link in info['DEVLINKS']
+                        if link.startswith('/dev/disk/by-path')]
+        if len(devlinks) == 0:
+            # use FS UUID if present
+            devlinks = [link for link in info['DEVLINKS']
+                        if '/by-uuid' in link]
+            if len(devlinks) == 0 and block_type == 'part':
+                devlinks = [link for link in info['DEVLINKS']
+                            if '/by-partuuid' in link]
+
+    return devlinks[0] if len(devlinks) else device_path
+
+
 def fstab_line_for_data(fdata):
     """Return a string representing fdata in /etc/fstab format.
 
@@ -883,8 +922,7 @@ def fstab_line_for_data(fdata):
     if fdata.spec is None:
         if not fdata.device:
             raise ValueError("FstabData missing both spec and device.")
-        uuid = block.get_volume_uuid(fdata.device)
-        spec = ("UUID=%s" % uuid) if uuid else fdata.device
+        spec = get_volume_spec(fdata.device)
     else:
         spec = fdata.spec
 
@@ -896,8 +934,20 @@ def fstab_line_for_data(fdata):
     else:
         options = fdata.options
 
-    return ' '.join((spec, path, fdata.fstype, options,
-                     fdata.freq, fdata.passno)) + "\n"
+    if path != "none":
+        # prefer provided spec over device
+        device = fdata.spec if fdata.spec else None
+        # if not provided a spec, derive device from calculated spec value
+        if not device:
+            device = fdata.device if fdata.device else spec
+        comment = "# %s was on %s during curtin installation" % (path, device)
+    else:
+        comment = None
+
+    entry = ' '.join((spec, path, fdata.fstype, options,
+                      fdata.freq, fdata.passno)) + "\n"
+    line = '\n'.join([comment, entry] if comment else [entry])
+    return line
 
 
 def mount_fstab_data(fdata, target=None):
@@ -960,7 +1010,7 @@ def mount_handler(info, storage_config):
     Mount specified device under target at 'path' and generate
     fstab entry.
     """
-    state = util.load_command_environment()
+    state = util.load_command_environment(strict=True)
     mount_apply(mount_data(info, storage_config),
                 target=state.get('target'), fstab=state.get('fstab'))
 
@@ -1050,7 +1100,7 @@ def lvm_partition_handler(info, storage_config):
 
 
 def dm_crypt_handler(info, storage_config):
-    state = util.load_command_environment()
+    state = util.load_command_environment(strict=True)
     volume = info.get('volume')
     keysize = info.get('keysize')
     cipher = info.get('cipher')
@@ -1062,6 +1112,7 @@ def dm_crypt_handler(info, storage_config):
         dm_name = info.get('id')
 
     volume_path = get_path_to_storage_volume(volume, storage_config)
+    volume_byid_path = block.disk_to_byid_path(volume_path)
 
     if 'keyfile' in info:
         if 'key' in info:
@@ -1077,16 +1128,45 @@ def dm_crypt_handler(info, storage_config):
     else:
         raise ValueError("encryption key or keyfile must be specified")
 
-    cmd = ["cryptsetup"]
-    if cipher:
-        cmd.extend(["--cipher", cipher])
-    if keysize:
-        cmd.extend(["--key-size", keysize])
-    cmd.extend(["luksFormat", volume_path, keyfile])
-
-    util.subp(cmd)
+    # if zkey is available, attempt to generate and use it; if it's not
+    # available or fails to setup properly, fallback to normal cryptsetup
+    # passing strict=False downgrades log messages to warnings
+    zkey_used = None
+    if block.zkey_supported(strict=False):
+        volume_name = "%s:%s" % (volume_byid_path, dm_name)
+        LOG.debug('Attempting to setup zkey for %s', volume_name)
+        luks_type = 'luks2'
+        gen_cmd = ['zkey', 'generate', '--xts', '--volume-type', luks_type,
+                   '--sector-size', '4096', '--name', dm_name,
+                   '--description',
+                   "curtin generated zkey for %s" % volume_name,
+                   '--volumes', volume_name]
+        run_cmd = ['zkey', 'cryptsetup', '--run', '--volumes',
+                   volume_byid_path, '--batch-mode', '--key-file', keyfile]
+        try:
+            util.subp(gen_cmd, capture=True)
+            util.subp(run_cmd, capture=True)
+            zkey_used = os.path.join(os.path.split(state['fstab'])[0],
+                                     "zkey_used")
+            # mark in state that we used zkey
+            util.write_file(zkey_used, "1")
+        except util.ProcessExecutionError as e:
+            LOG.exception(e)
+            msg = 'Setup of zkey on %s failed, fallback to cryptsetup.'
+            LOG.error(msg % volume_path)
+
+    if not zkey_used:
+        LOG.debug('Using cryptsetup on %s', volume_path)
+        luks_type = "luks"
+        cmd = ["cryptsetup"]
+        if cipher:
+            cmd.extend(["--cipher", cipher])
+        if keysize:
+            cmd.extend(["--key-size", keysize])
+        cmd.extend(["luksFormat", volume_path, keyfile])
+        util.subp(cmd)
 
-    cmd = ["cryptsetup", "open", "--type", "luks", volume_path, dm_name,
+    cmd = ["cryptsetup", "open", "--type", luks_type, volume_path, dm_name,
            "--key-file", keyfile]
 
     util.subp(cmd)
@@ -1097,11 +1177,11 @@ def dm_crypt_handler(info, storage_config):
     # A crypttab will be created in the same directory as the fstab in the
     # configuration. This will then be copied onto the system later
     if state['fstab']:
-        crypt_tab_location = os.path.join(os.path.split(state['fstab'])[0],
-                                          "crypttab")
+        state_dir = os.path.dirname(state['fstab'])
+        crypt_tab_location = os.path.join(state_dir, "crypttab")
         uuid = block.get_volume_uuid(volume_path)
-        with open(crypt_tab_location, "a") as fp:
-            fp.write("%s UUID=%s none luks\n" % (dm_name, uuid))
+        util.write_file(crypt_tab_location,
+                        "%s UUID=%s none luks\n" % (dm_name, uuid), omode="a")
     else:
         LOG.info("fstab configuration is not present in environment, so \
             cannot locate an appropriate directory to write crypttab in \
@@ -1109,7 +1189,7 @@ def dm_crypt_handler(info, storage_config):
 
 
 def raid_handler(info, storage_config):
-    state = util.load_command_environment()
+    state = util.load_command_environment(strict=True)
     devices = info.get('devices')
     raidlevel = info.get('raidlevel')
     spare_devices = info.get('spare_devices')
@@ -1166,11 +1246,10 @@ def raid_handler(info, storage_config):
     # The file must also be written onto the running system to enable it to run
     # mdadm --assemble and continue installation
     if state['fstab']:
-        mdadm_location = os.path.join(os.path.split(state['fstab'])[0],
-                                      "mdadm.conf")
+        state_dir = os.path.dirname(state['fstab'])
+        mdadm_location = os.path.join(state_dir, "mdadm.conf")
         mdadm_scan_data = mdadm.mdadm_detail_scan()
-        with open(mdadm_location, "w") as fp:
-            fp.write(mdadm_scan_data)
+        util.write_file(mdadm_location, mdadm_scan_data)
     else:
         LOG.info("fstab configuration is not present in the environment, so \
             cannot locate an appropriate directory to write mdadm.conf in, \
@@ -1448,7 +1527,7 @@ def zpool_handler(info, storage_config):
     """
     zfs.zfs_assert_supported()
 
-    state = util.load_command_environment()
+    state = util.load_command_environment(strict=True)
 
     # extract /dev/disk/by-id paths for each volume used
     vdevs = [get_path_to_storage_volume(v, storage_config)
@@ -1487,7 +1566,7 @@ def zfs_handler(info, storage_config):
     """
     zfs.zfs_assert_supported()
 
-    state = util.load_command_environment()
+    state = util.load_command_environment(strict=True)
     poolname = get_poolname(info, storage_config)
     volume = info.get('volume')
     properties = info.get('properties', {})
@@ -1505,20 +1584,24 @@ def zfs_handler(info, storage_config):
             util.write_file(state['fstab'], fstab_entry, omode='a')
 
 
-def get_disk_paths_from_storage_config(storage_config):
-    """Returns a list of disk paths in a storage config filtering out
-       preserved or disks which do not have wipe configuration.
+def get_device_paths_from_storage_config(storage_config):
+    """Returns a list of device paths in a storage config filtering out
+       preserved or devices which do not have wipe configuration.
 
     :param: storage_config: Ordered dict of storage configation
     """
-    def get_path_if_present(disk, config):
-        return get_path_to_storage_volume(disk, config)
-
-    return [get_path_if_present(k, storage_config)
-            for (k, v) in storage_config.items()
-            if v.get('type') == 'disk' and
-            config.value_as_boolean(v.get('wipe')) and
-            not config.value_as_boolean(v.get('preserve'))]
+    dpaths = []
+    for (k, v) in storage_config.items():
+        if v.get('type') in ['disk', 'partition']:
+            if config.value_as_boolean(v.get('wipe')):
+                if config.value_as_boolean(v.get('preserve')):
+                    continue
+                try:
+                    dpaths.append(
+                        get_path_to_storage_volume(k, storage_config))
+                except Exception:
+                    pass
+    return dpaths
 
 
 def zfsroot_update_storage_config(storage_config):
@@ -1655,7 +1738,7 @@ def meta_custom(args):
         'zpool': zpool_handler,
     }
 
-    state = util.load_command_environment()
+    state = util.load_command_environment(strict=True)
     cfg = config.load_command_config(args, state)
 
     storage_config_dict = extract_storage_ordered_dict(cfg)
@@ -1689,7 +1772,7 @@ def meta_simple(args):
     """Creates a root partition. If args.mode == SIMPLE_BOOT, it will also
     create a separate /boot partition.
     """
-    state = util.load_command_environment()
+    state = util.load_command_environment(strict=True)
     cfg = config.load_command_config(args, state)
     if args.target is not None:
         state['target'] = args.target
diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
index 75f5083..542557c 100644
--- a/curtin/commands/curthooks.py
+++ b/curtin/commands/curthooks.py
@@ -104,6 +104,68 @@ def disable_overlayroot(cfg, target):
         shutil.move(local_conf, local_conf + ".old")
 
 
+def _update_initramfs_tools(machine=None):
+    """ Return a list of binary names used to update an initramfs.
+
+    On some architectures there are helper binaries that are also
+    used and will be included in the list.
+    """
+    tools = ['update-initramfs']
+    if not machine:
+        machine = platform.machine()
+    if machine == 's390x':
+        tools.append('zipl')
+    elif machine == 'aarch64':
+        tools.append('flash-kernel')
+    return tools
+
+
+def disable_update_initramfs(cfg, target, machine=None):
+    """ Find update-initramfs tools in target and change their name. """
+    with util.ChrootableTarget(target) as in_chroot:
+        for tool in _update_initramfs_tools(machine=machine):
+            found = util.which(tool, target=target)
+            if found:
+                LOG.debug('Diverting original %s in target.', tool)
+                rename = found + '.curtin-disabled'
+                divert = ['dpkg-divert', '--add', '--rename',
+                          '--divert', rename, found]
+                in_chroot.subp(divert)
+
+                # create a dummy update-initramfs which just returns true;
+                # this handles postinstall scripts which make invoke $tool
+                # directly
+                util.write_file(target + found,
+                                content="#!/bin/true\n# diverted by curtin",
+                                mode=0o755)
+
+
+def update_initramfs_is_disabled(target):
+    """ Return a bool indicating if initramfs tooling is disabled. """
+    disabled = []
+    with util.ChrootableTarget(target) as in_chroot:
+        out, _err = in_chroot.subp(['dpkg-divert', '--list'], capture=True)
+        disabled = [divert for divert in out.splitlines()
+                    if divert.endswith('.curtin-disabled')]
+    return len(disabled) > 0
+
+
+def enable_update_initramfs(cfg, target, machine=None):
+    """ Enable initramfs update tools by restoring their original name. """
+    if update_initramfs_is_disabled(target):
+        with util.ChrootableTarget(target) as in_chroot:
+            for tool in _update_initramfs_tools(machine=machine):
+                LOG.info('Restoring %s in target for initrd updates.', tool)
+                found = util.which(tool, target=target)
+                if not found:
+                    continue
+                # remove the diverted
+                util.del_file(target + found)
+                # un-divert and restore original file
+                in_chroot.subp(
+                    ['dpkg-divert', '--rename', '--remove', found])
+
+
 def setup_zipl(cfg, target):
     if platform.machine() != 's390x':
         return
@@ -262,6 +324,11 @@ def get_flash_kernel_pkgs(arch=None, uefi=None):
 
 
 def setup_kernel_img_conf(target):
+    # kernel-img.conf only needed on release prior to 19.10
+    lsb_info = distro.lsb_release(target=target)
+    if tuple(map(int, lsb_info['release'].split('.'))) >= (19, 10):
+        return
+
     kernel_img_conf_vars = {
         'bootloader': 'no',
         'inboot': 'yes',
@@ -420,12 +487,25 @@ def setup_grub(cfg, target, osfamily=DISTROS.debian):
 
     if storage_cfg_odict:
         storage_grub_devices = []
-        for item_id, item in storage_cfg_odict.items():
-            if not item.get('grub_device'):
-                continue
-            LOG.debug("checking: %s", item)
-            storage_grub_devices.append(
-                get_path_to_storage_volume(item_id, storage_cfg_odict))
+        if util.is_uefi_bootable():
+            # Curtin only supports creating one EFI system partition. Thus the
+            # grub_device can only be the default system partition mounted at
+            # /boot/efi.
+            for item_id, item in storage_cfg_odict.items():
+                if item.get('path') == '/boot/efi':
+                    efi_dev_id = storage_cfg_odict[item['device']]['volume']
+                    LOG.debug("checking: %s", item)
+                    storage_grub_devices.append(get_path_to_storage_volume(
+                        efi_dev_id, storage_cfg_odict))
+                    break
+        else:
+            for item_id, item in storage_cfg_odict.items():
+                if not item.get('grub_device'):
+                    continue
+                LOG.debug("checking: %s", item)
+                storage_grub_devices.append(
+                    get_path_to_storage_volume(item_id, storage_cfg_odict))
+
         if len(storage_grub_devices) > 0:
             grubcfg['install_devices'] = storage_grub_devices
 
@@ -509,10 +589,7 @@ def setup_grub(cfg, target, osfamily=DISTROS.debian):
     LOG.debug("installing grub to %s [replace_default=%s]",
               instdevs, replace_default)
 
-    # rhel lvm uses /run during grub configuration
-    chroot_mounts = (["/dev", "/proc", "/sys", "/run"]
-                     if osfamily == DISTROS.redhat else None)
-    with util.ChrootableTarget(target, mounts=chroot_mounts):
+    with util.ChrootableTarget(target):
         args = ['install-grub']
         if util.is_uefi_bootable():
             args.append("--uefi")
@@ -529,18 +606,66 @@ def setup_grub(cfg, target, osfamily=DISTROS.debian):
         join_stdout_err = ['sh', '-c', 'exec "$0" "$@" 2>&1']
         out, _err = util.subp(
             join_stdout_err + args + instdevs, env=env, capture=True)
-        LOG.debug("%s\n%s\n", args, out)
+        LOG.debug("%s\n%s\n", args + instdevs, out)
 
     if util.is_uefi_bootable() and grubcfg.get('update_nvram', True):
         uefi_reorder_loaders(grubcfg, target)
 
 
 def update_initramfs(target=None, all_kernels=False):
-    cmd = ['update-initramfs', '-u']
-    if all_kernels:
-        cmd.extend(['-k', 'all'])
-    with util.ChrootableTarget(target) as in_chroot:
-        in_chroot.subp(cmd)
+    """ Invoke update-initramfs in the target path.
+
+    Look up the installed kernel versions in the target
+    to ensure that an initrd get created or updated as needed.
+    This allows curtin to invoke update-initramfs exactly once
+    at the end of the install instead of multiple calls.
+    """
+    if update_initramfs_is_disabled(target):
+        return
+
+    # We keep the all_kernels flag for callers, the implementation
+    # now will operate correctly on all kernels present in the image
+    # which is almost always exactly one.
+    #
+    # Ideally curtin should be able to use update-initramfs -k all
+    # however, update-initramfs expects to be able to find out which
+    # versions of kernels are installed by using values from the
+    # kernel package invoking update-initramfs -c <kernel version>.
+    # With update-initramfs diverted, nothing captures the kernel
+    # version strings in the place where update-initramfs expects
+    # to find this information.  Instead, curtin will examine
+    # /boot to see what kernels and initramfs are installed and
+    # either create or update as needed.
+    #
+    # This loop below will examine the contents of target's
+    # /boot and pattern match for kernel files. On Ubuntu this
+    # is in the form of /boot/vmlinu[xz]-<uname -r version>.
+    #
+    # For each kernel, we extract the version string and then
+    # construct the name of of the initrd file that *would*
+    # have been created when the kernel package was installed
+    # if curtin had not diverted update-initramfs to prevent
+    # duplicate initrd creation.
+    #
+    # if the initrd file exists, then we only need to invoke
+    # update-initramfs's -u (update) method.  If the file does
+    # not exist, then we need to run the -c (create) method.
+    boot = paths.target_path(target, 'boot')
+    for kernel in sorted(glob.glob(boot + '/vmlinu*-*')):
+        kfile = os.path.basename(kernel)
+        # handle vmlinux or vmlinuz
+        kprefix = kfile.split('-')[0]
+        version = kfile.replace(kprefix + '-', '')
+        initrd = kernel.replace(kprefix, 'initrd.img')
+        # -u == update, -c == create
+        mode = '-u' if os.path.exists(initrd) else '-c'
+        cmd = ['update-initramfs', mode, '-k', version]
+        with util.ChrootableTarget(target) as in_chroot:
+            in_chroot.subp(cmd)
+            if not os.path.exists(initrd):
+                files = os.listdir(target + '/boot')
+                LOG.debug('Failed to find initrd %s', initrd)
+                LOG.debug('Files in target /boot: %s', files)
 
 
 def copy_fstab(fstab, target):
@@ -548,7 +673,10 @@ def copy_fstab(fstab, target):
         LOG.warn("fstab variable not in state, not copying fstab")
         return
 
-    shutil.copy(fstab, os.path.sep.join([target, 'etc/fstab']))
+    content = util.load_file(fstab)
+    header = distro.fstab_header()
+    util.write_file(os.path.sep.join([target, 'etc/fstab']),
+                    content="%s\n%s" % (header, content))
 
 
 def copy_crypttab(crypttab, target):
@@ -594,6 +722,28 @@ def copy_zpool_cache(zpool_cache, target):
     shutil.copy(zpool_cache, os.path.sep.join([target, 'etc/zfs']))
 
 
+def copy_zkey_repository(zkey_repository, target,
+                         target_repo='etc/zkey/repository'):
+    if not zkey_repository:
+        LOG.warn("zkey repository path must be specified, not copying")
+        return
+
+    tdir = os.path.sep.join([target, target_repo])
+    if not os.path.exists(tdir):
+        util.ensure_dir(tdir)
+
+    files_copied = []
+    for src in os.listdir(zkey_repository):
+        source_path = os.path.join(zkey_repository, src)
+        target_path = os.path.join(tdir, src)
+        if not os.path.exists(target_path):
+            shutil.copy2(source_path, target_path)
+            files_copied.append(target_path)
+
+    LOG.debug('Imported zkey repo %s with files: %s',
+              zkey_repository, files_copied)
+
+
 def apply_networking(target, state):
     netconf = state.get('network_config')
     interfaces = state.get('interfaces')
@@ -862,12 +1012,21 @@ def install_missing_packages(cfg, target, osfamily=DISTROS.debian):
     # UEFI requires grub-efi-{arch}. If a signed version of that package
     # exists then it will be installed.
     if util.is_uefi_bootable():
-        uefi_pkgs = []
+        uefi_pkgs = ['efibootmgr']
         if osfamily == DISTROS.redhat:
             # centos/redhat doesn't support 32-bit?
-            uefi_pkgs.extend(['grub2-efi-x64-modules'])
+            if 'grub2-efi-x64-modules' not in installed_packages:
+                # Previously Curtin only supported unsigned GRUB due to an
+                # upstream bug. By default lp:maas-image-builder and
+                # packer-maas have grub preinstalled. If grub2-efi-x64-modules
+                # is already in the image use unsigned grub so the install
+                # doesn't require Internet access. If grub is missing use the
+                # signed version.
+                uefi_pkgs.extend(['grub2-efi-x64', 'shim-x64'])
         elif osfamily == DISTROS.debian:
             arch = util.get_architecture()
+            if arch == 'i386':
+                arch = 'ia32'
             uefi_pkgs.append('grub-efi-%s' % arch)
 
             # Architecture might support a signed UEFI loader
@@ -1143,40 +1302,43 @@ def redhat_upgrade_cloud_init(netcfg, target=None, osfamily=DISTROS.redhat):
             cloud_init_yum_repo = (
                 paths.target_path(target,
                                   'etc/yum.repos.d/curtin-cloud-init.repo'))
+            rhel_ver = distro.rpm_get_dist_id(target)
             # Inject cloud-init daily yum repo
             util.write_file(cloud_init_yum_repo,
-                            content=cloud_init_repo(
-                                distro.rpm_get_dist_id(target)))
+                            content=cloud_init_repo(rhel_ver))
 
-            # we separate the installation of repository packages (epel,
+            # ensure up-to-date ca-certificates to handle https mirror
+            # connections for epel and cloud-init-el.
+            packages = ['ca-certificates']
+
+            if int(rhel_ver) < 8:
+                # cloud-init in RHEL < 8 requires EPEL for dependencies.
+                packages += ['epel-release']
+                # RHEL8+ no longer ships bridge-utils. This does not effect
+                # bridge configuration. Only install on RHEL < 8 if not
+                # available, do not upgrade.
+                with util.ChrootableTarget(target) as in_chroot:
+                    try:
+                        in_chroot.subp(['rpm', '-q', 'bridge-utils'],
+                                       capture=False, rcs=[0])
+                    except util.ProcessExecutionError:
+                        LOG.debug(
+                            'Image missing bridge-utils package, installing')
+                        packages += ['bridge-utils']
+
+            packages += ['cloud-init-el-release', 'cloud-init']
+
+            # We separate the installation of repository packages (epel,
             # cloud-init-el-release) as we need a new invocation of yum
             # to read the newly installed repo files.
-
-            # ensure up-to-date ca-certificates to handle https mirror
-            # connections
-            distro.install_packages(['ca-certificates'], target=target,
-                                    osfamily=osfamily)
-            distro.install_packages(['epel-release'], target=target,
-                                    osfamily=osfamily)
-            distro.install_packages(['cloud-init-el-release'], target=target,
-                                    osfamily=osfamily)
-            distro.install_packages(['cloud-init'], target=target,
-                                    osfamily=osfamily)
+            for package in packages:
+                distro.install_packages(
+                    [package], target=target, osfamily=osfamily)
 
             # remove cloud-init el-stable bootstrap repo config as the
             # cloud-init-el-release package points to the correct repo
             util.del_file(cloud_init_yum_repo)
 
-            # install bridge-utils if needed
-            with util.ChrootableTarget(target) as in_chroot:
-                try:
-                    in_chroot.subp(['rpm', '-q', 'bridge-utils'],
-                                   capture=False, rcs=[0])
-                except util.ProcessExecutionError:
-                    LOG.debug('Image missing bridge-utils package, installing')
-                    distro.install_packages(['bridge-utils'], target=target,
-                                            osfamily=osfamily)
-
     LOG.info('Passing network configuration through to target')
     net.render_netconfig_passthrough(target, netconfig={'network': netcfg})
 
@@ -1255,6 +1417,7 @@ def builtin_curthooks(cfg, target, state):
     LOG.info('Running curtin builtin curthooks')
     stack_prefix = state.get('report_stack_prefix', '')
     state_etcd = os.path.split(state['fstab'])[0]
+    machine = platform.machine()
 
     distro_info = distro.get_distroinfo(target=target)
     if not distro_info:
@@ -1269,6 +1432,7 @@ def builtin_curthooks(cfg, target, state):
                 description="configuring apt configuring apt"):
             do_apt_config(cfg, target)
             disable_overlayroot(cfg, target)
+            disable_update_initramfs(cfg, target, machine)
 
         # LP: #1742560 prevent zfs-dkms from being installed (Xenial)
         if distro.lsb_release(target=target)['codename'] == 'xenial':
@@ -1361,12 +1525,6 @@ def builtin_curthooks(cfg, target, state):
                 description="enabling selinux autorelabel mode"):
             redhat_apply_selinux_autorelabel(target)
 
-        with events.ReportEventStack(
-                name=stack_prefix + '/updating-initramfs-configuration',
-                reporting_enabled=True, level="INFO",
-                description="updating initramfs configuration"):
-            redhat_update_initramfs(target, cfg)
-
     with events.ReportEventStack(
             name=stack_prefix + '/pollinate-user-agent',
             reporting_enabled=True, level="INFO",
@@ -1379,6 +1537,13 @@ def builtin_curthooks(cfg, target, state):
         if os.path.exists(zpool_cache):
             copy_zpool_cache(zpool_cache, target)
 
+        zkey_repository = '/etc/zkey/repository'
+        zkey_used = os.path.join(os.path.split(state['fstab'])[0], "zkey_used")
+        if all(map(os.path.exists, [zkey_repository, zkey_used])):
+            distro.install_packages(['s390-tools-zkey'], target=target,
+                                    osfamily=osfamily)
+            copy_zkey_repository(zkey_repository, target)
+
         # If a crypttab file was created by block_meta than it needs to be
         # copied onto the target system, and update_initramfs() needs to be
         # run, so that the cryptsetup hooks are properly configured on the
@@ -1395,17 +1560,28 @@ def builtin_curthooks(cfg, target, state):
     if os.path.isdir(udev_rules_d):
         copy_dname_rules(udev_rules_d, target)
 
+    with events.ReportEventStack(
+            name=stack_prefix + '/updating-initramfs-configuration',
+            reporting_enabled=True, level="INFO",
+            description="updating initramfs configuration"):
+        if osfamily == DISTROS.debian:
+            # re-enable update_initramfs
+            enable_update_initramfs(cfg, target, machine)
+            update_initramfs(target, all_kernels=True)
+        elif osfamily == DISTROS.redhat:
+            redhat_update_initramfs(target, cfg)
+
     # As a rule, ARMv7 systems don't use grub. This may change some
     # day, but for now, assume no. They do require the initramfs
     # to be updated, and this also triggers boot loader setup via
     # flash-kernel.
-    machine = platform.machine()
     if (machine.startswith('armv7') or
             machine.startswith('s390x') or
             machine.startswith('aarch64') and not util.is_uefi_bootable()):
-        update_initramfs(target)
-    else:
-        setup_grub(cfg, target, osfamily=osfamily)
+        return
+
+    # all other paths lead to grub
+    setup_grub(cfg, target, osfamily=osfamily)
 
 
 def curthooks(args):
diff --git a/curtin/commands/install.py b/curtin/commands/install.py
index ad17508..a3471f6 100644
--- a/curtin/commands/install.py
+++ b/curtin/commands/install.py
@@ -11,7 +11,7 @@ import subprocess
 import sys
 import tempfile
 
-from curtin.block import iscsi
+from curtin.block import iscsi, zfs
 from curtin import config
 from curtin import distro
 from curtin import util
@@ -505,6 +505,10 @@ def cmd_install(args):
             if iscsi.get_iscsi_disks_from_config(cfg):
                 iscsi.restart_iscsi_service()
 
+            for pool in zfs.get_zpool_from_config(cfg):
+                LOG.debug('Exporting ZFS zpool %s', pool)
+                zfs.zpool_export(pool)
+
             shutil.rmtree(workingd.top)
 
     apply_power_state(cfg.get('power_state'))
diff --git a/curtin/deps/__init__.py b/curtin/deps/__init__.py
index 37c4469..714ef18 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|tools)$'),
     ('mkfs.ext4', 'e2fsprogs'),
     ('mkfs.xfs', 'xfsprogs'),
     ('partprobe', 'parted'),
diff --git a/curtin/distro.py b/curtin/distro.py
index 9714515..ed178bd 100644
--- a/curtin/distro.py
+++ b/curtin/distro.py
@@ -5,6 +5,7 @@ import os
 import re
 import shutil
 import tempfile
+import textwrap
 
 from .paths import target_path
 from .util import (
@@ -284,7 +285,13 @@ def run_yum_command(mode, args=None, opts=None, env=None, target=None,
     if opts is None:
         opts = []
 
-    cmd = ['yum'] + defopts + opts + [mode] + args
+    # dnf is a drop in replacement for yum. On newer RH based systems yum
+    # is just a sym link to dnf.
+    if which('dnf', target=target):
+        cmd = ['dnf']
+    else:
+        cmd = ['yum']
+    cmd += defopts + opts + [mode] + args
     if not execute:
         return env, cmd
 
@@ -311,8 +318,14 @@ def yum_install(mode, packages=None, opts=None, env=None, target=None,
         raise ValueError(
             'Unsupported mode "%s" for yum package install/upgrade' % mode)
 
+    # dnf is a drop in replacement for yum. On newer RH based systems yum
+    # is just a sym link to dnf.
+    if which('dnf', target=target):
+        cmd = ['dnf']
+    else:
+        cmd = ['yum']
     # download first, then install/upgrade from cache
-    cmd = ['yum'] + defopts + opts + [mode]
+    cmd += defopts + opts + [mode]
     dl_opts = ['--downloadonly', '--setopt=keepcache=1']
     inst_opts = ['--cacheonly']
 
@@ -509,4 +522,14 @@ def get_package_version(pkg, target=None, semx=None):
         return None
 
 
+def fstab_header():
+    return textwrap.dedent("""\
+# /etc/fstab: static file system information.
+#
+# Use 'blkid' to print the universally unique identifier for a
+# device; this may be used with UUID= as a more robust way to name devices
+# that works even if disks are added and removed. See fstab(5).
+#
+# <file system> <mount point>   <type>  <options>       <dump>  <pass>""")
+
 # vi: ts=4 expandtab syntax=python
diff --git a/curtin/net/deps.py b/curtin/net/deps.py
index b98961d..cbebae9 100644
--- a/curtin/net/deps.py
+++ b/curtin/net/deps.py
@@ -47,11 +47,11 @@ def detect_required_packages_mapping(osfamily=DISTROS.debian):
     distro_mapping = {
         DISTROS.debian: {
             'bond': ['ifenslave'],
-            'bonds': [],
+            'bonds': ['ifenslave'],
             'bridge': ['bridge-utils'],
-            'bridges': [],
+            'bridges': ['bridge-utils'],
             'vlan': ['vlan'],
-            'vlans': []},
+            'vlans': ['vlan']},
         DISTROS.redhat: {
             'bond': [],
             'bonds': [],
diff --git a/curtin/storage_config.py b/curtin/storage_config.py
index a79f30b..4244b3e 100644
--- a/curtin/storage_config.py
+++ b/curtin/storage_config.py
@@ -304,7 +304,8 @@ def merge_config_trees_to_list(config_trees):
             max_level = level
         item_cfg = tree[top_item_id]
         if top_item_id in reg:
-            raise ValueError('Duplicate id: %s' % top_item_id)
+            LOG.warning('Dropping Duplicate id: %s' % top_item_id)
+            continue
         reg[top_item_id] = {'level': level, 'config': item_cfg}
 
     def sort_level(configs):
@@ -388,15 +389,15 @@ class ProbertParser(object):
                     data = {}
                 self.class_data = data
             else:
-                raise ValueError('probe_data missing %s data' %
-                                 self.probe_data_key)
+                LOG.warning('probe_data missing %s data', self.probe_data_key)
+                self.class_data = {}
 
         # We keep a reference to the blockdev_data on the superclass
         # as each specific parser has common needs to reference
         # this data separate from the BlockdevParser class.
-        self.blockdev_data = self.probe_data.get('blockdev')
+        self.blockdev_data = self.probe_data.get('blockdev', {})
         if not self.blockdev_data:
-            raise ValueError('probe_data missing valid "blockdev" data')
+            LOG.warning('probe_data missing valid "blockdev" data')
 
     def parse(self):
         raise NotImplementedError()
@@ -420,14 +421,76 @@ class ProbertParser(object):
 
         return None
 
+    def is_mpath(self, blockdev):
+        if blockdev.get('DM_MULTIPATH_DEVICE_PATH') == "1":
+            return True
+
+        return bool('mpath-' in blockdev.get('DM_UUID', ''))
+
+    def get_mpath_name(self, blockdev):
+        mpath_data = self.probe_data.get('multipath')
+        if not mpath_data:
+            return None
+
+        bd_name = blockdev['DEVNAME']
+        if blockdev['DEVTYPE'] == 'partition':
+            bd_name = self.partition_parent_devname(blockdev)
+        bd_name = os.path.basename(bd_name)
+        for path in mpath_data['paths']:
+            if bd_name == path['device']:
+                rv = path['multipath']
+                return rv
+
+    def find_mpath_member(self, blockdev):
+        if blockdev.get('DM_MULTIPATH_DEVICE_PATH') == "1":
+            # find all other DM_MULTIPATH_DEVICE_PATH devs with same serial
+            serial = blockdev.get('ID_SERIAL')
+            members = sorted([os.path.basename(dev['DEVNAME'])
+                              for dev in self.blockdev_data.values()
+                              if dev.get("ID_SERIAL", "") == serial and
+                              dev['DEVTYPE'] == blockdev['DEVTYPE']])
+            # [/dev/sda, /dev/sdb]
+            # [/dev/sda1, /dev/sda2, /dev/sdb1, /dev/sdb2]
+
+        else:
+            dm_mpath = blockdev.get('DM_MPATH')
+            dm_uuid = blockdev.get('DM_UUID')
+            dm_part = blockdev.get('DM_PART')
+
+            if dm_mpath:
+                multipath = dm_mpath
+            else:
+                # part1-mpath-30000000000000064
+                # mpath-30000000000000064
+                # mpath-36005076306ffd6b60000000000002406
+                match = re.search(r'mpath\-([a-zA-Z]*|\d*)+$', dm_uuid)
+                if not match:
+                    LOG.debug('Failed to extract multipath ID pattern from '
+                              'DM_UUID value: "%s"', dm_uuid)
+                    return None
+                # remove leading 'mpath-'
+                multipath = match.group(0)[6:]
+            mpath_data = self.probe_data.get('multipath')
+            if not mpath_data:
+                return None
+            members = sorted([path['device'] for path in mpath_data['paths']
+                              if path['multipath'] == multipath])
+
+            # append partition number if present
+            if dm_part:
+                members = [member + dm_part for member in members]
+
+        if len(members):
+            return members[0]
+
+        return None
+
     def blockdev_to_id(self, blockdev):
         """ Examine a blockdev dictionary and return a tuple of curtin
             storage type and name that can be used as a value for
             storage_config ids (opaque reference to other storage_config
             elements).
         """
-        def is_mpath(blockdev):
-            return bool(blockdev.get('DM_UUID', '').startswith('mpath-'))
 
         def is_dmcrypt(blockdev):
             return bool(blockdev.get('DM_UUID', '').startswith('CRYPT-LUKS'))
@@ -441,8 +504,15 @@ class ProbertParser(object):
             if 'DM_LV_NAME' in blockdev:
                 devtype = 'lvm-partition'
                 name = blockdev['DM_LV_NAME']
-            elif is_mpath(blockdev):
-                name = blockdev['DM_UUID']
+            elif self.is_mpath(blockdev):
+                # extract a multipath member device
+                member = self.find_mpath_member(blockdev)
+                if member:
+                    name = member
+                else:
+                    name = blockdev['DM_UUID']
+                if 'DM_PART' in blockdev:
+                    devtype = 'partition'
             elif is_dmcrypt(blockdev):
                 devtype = 'dmcrypt'
                 name = blockdev['DM_NAME']
@@ -505,7 +575,8 @@ class BcacheParser(ProbertParser):
             msg = ('Invalid "blockdev" value for cache device '
                    'uuid=%s' % cset_uuid)
             if not cset_uuid:
-                raise ValueError(msg)
+                LOG.warning(msg)
+                return None
 
             for devuuid, config in cache_data.items():
                 cache = _sb_get(config, 'cset.uuid')
@@ -518,6 +589,8 @@ class BcacheParser(ProbertParser):
             by_uuid = '/dev/bcache/by-uuid/' + uuid
             label = _sb_get(backing_data, 'dev.label')
             for devname, data in blockdev_data.items():
+                if not devname:
+                    continue
                 if devname.startswith('/dev/bcache'):
                     # DEVLINKS is a space separated list
                     devlinks = data.get('DEVLINKS', '').split()
@@ -525,7 +598,7 @@ class BcacheParser(ProbertParser):
                         return devname
             if label:
                 return label
-            raise ValueError('Failed to find bcache %s ' % (by_uuid))
+            LOG.warning('Failed to find bcache %s ' % (by_uuid))
 
         def _cache_mode(dev_data):
             # "1 [writeback]" -> "writeback"
@@ -535,12 +608,14 @@ class BcacheParser(ProbertParser):
 
             return None
 
+        if not self.blockdev_data:
+            return None
+
         backing_device = backing_data.get('blockdev')
         cache_device = _find_cache_device(backing_data, self.caching)
         cache_mode = _cache_mode(backing_data)
-        bcache_name = os.path.basename(
-            _find_bcache_devname(backing_uuid, backing_data,
-                                 self.blockdev_data))
+        bcache_name = os.path.basename(_find_bcache_devname(backing_uuid,
+                                       backing_data, self.blockdev_data))
         bcache_entry = {'type': 'bcache', 'id': 'disk-%s' % bcache_name,
                         'name': bcache_name}
 
@@ -571,9 +646,10 @@ class BlockdevParser(ProbertParser):
         errors = []
 
         for devname, data in self.blockdev_data.items():
-            # skip composed devices here
+            # skip composed devices here, except partitions
             if data.get('DEVPATH', '').startswith('/devices/virtual'):
-                continue
+                if data.get('DEVTYPE', '') != "partition":
+                    continue
             entry = self.asdict(data)
             if entry:
                 try:
@@ -660,6 +736,9 @@ class BlockdevParser(ProbertParser):
             'type': blockdev_data['DEVTYPE'],
             'id': self.blockdev_to_id(blockdev_data),
         }
+        if blockdev_data.get('DM_MULTIPATH_DEVICE_PATH') == "1":
+            mpath_name = self.get_mpath_name(blockdev_data)
+            entry['multipath'] = mpath_name
 
         # default disks to gpt
         if entry['type'] == 'disk':
@@ -669,8 +748,12 @@ class BlockdevParser(ProbertParser):
             # set wwn, serial, and path
             entry.update(uniq_ids)
 
-            # default to gpt if not present
-            entry['ptable'] = blockdev_data.get('ID_PART_TABLE_TYPE', 'gpt')
+            if 'ID_PART_TABLE_TYPE' in blockdev_data:
+                ptype = blockdev_data['ID_PART_TABLE_TYPE']
+                if ptype in schemas._ptables:
+                    entry['ptable'] = ptype
+                else:
+                    entry['ptable'] = schemas._ptable_unsupported
             return entry
 
         if entry['type'] == 'partition':
@@ -683,7 +766,8 @@ class BlockdevParser(ProbertParser):
                 part = None
                 for pentry in ptable['partitions']:
                     node = pentry['node']
-                    if node.lstrip(parent_devname) == attrs['partition']:
+                    node_p = node.replace(parent_devname, '')
+                    if node_p.replace('p', '') == attrs['partition']:
                         part = pentry
                         break
 
@@ -919,7 +1003,6 @@ class RaidParser(ProbertParser):
            Collects storage config type: raid for valid
            data and returns tuple of lists, configs, errors.
         """
-
         configs = []
         errors = []
         for devname, data in self.class_data.items():
@@ -1103,7 +1186,7 @@ class ZfsParser(ProbertParser):
         return (zpool_configs + zfs_configs, errors)
 
 
-def extract_storage_config(probe_data):
+def extract_storage_config(probe_data, strict=False):
     """ Examine a probert storage dictionary and extract a curtin
         storage configuration that would recreate all of the
         storage devices present in the provided data.
@@ -1155,7 +1238,10 @@ def extract_storage_config(probe_data):
     for e in errors:
         LOG.exception('Validation error: %s\n' % e)
     if len(errors) > 0:
-        raise RuntimeError("Extract storage config does not validate.")
+        errmsg = "Extract storage config does not validate."
+        LOG.warning(errmsg)
+        if strict:
+            raise RuntimeError(errmsg)
 
     # build and merge probed data into a valid storage config by
     # generating a config tree for each item in the probed data
diff --git a/curtin/udev.py b/curtin/udev.py
index 106a7e7..e2e3dd0 100644
--- a/curtin/udev.py
+++ b/curtin/udev.py
@@ -1,6 +1,8 @@
 # This file is part of curtin. See LICENSE file for copyright and license info.
 
+import shlex
 import os
+
 from curtin import util
 from curtin.log import logged_call
 
@@ -73,7 +75,7 @@ def udevadm_info(path=None):
     if not path:
         raise ValueError('Invalid path: "%s"' % path)
 
-    info_cmd = ['udevadm', 'info', '--query=property', path]
+    info_cmd = ['udevadm', 'info', '--query=property', '--export', path]
     output, _ = util.subp(info_cmd, capture=True)
 
     # strip for trailing empty line
@@ -87,13 +89,19 @@ def udevadm_info(path=None):
         if not value:
             value = None
         if value:
-            # devlinks is a list of paths separated by space
-            # convert to a list for easy use
-            if key == 'DEVLINKS':
-                info[key] = value.split()
+            # preserve spaces in values to match udev database
+            parsed = shlex.split(value)
+            if ' ' not in value:
+                info[key] = parsed[0]
             else:
-                # preserve spaces in values, to match udev database
-                info[key] = value
+                # special case some known entries with spaces, e.g. ID_SERIAL
+                # and DEVLINKS, see tests/unittests/test_udev.py
+                if key == "DEVLINKS":
+                    info[key] = shlex.split(parsed[0])
+                elif key == 'ID_SERIAL':
+                    info[key] = parsed[0]
+                else:
+                    info[key] = parsed
 
     return info
 
diff --git a/curtin/util.py b/curtin/util.py
index 1ef17c0..eb2228f 100644
--- a/curtin/util.py
+++ b/curtin/util.py
@@ -632,12 +632,13 @@ class ChrootableTarget(object):
         if mounts is not None:
             self.mounts = mounts
         else:
-            self.mounts = ["/dev", "/proc", "/sys"]
+            self.mounts = ["/dev", "/proc", "/run", "/sys"]
         self.umounts = []
         self.disabled_daemons = False
         self.allow_daemons = allow_daemons
         self.sys_resolvconf = sys_resolvconf
         self.rconf_d = None
+        self.rc_tmp = None
 
     def __enter__(self):
         for p in self.mounts:
@@ -656,14 +657,20 @@ class ChrootableTarget(object):
             rtd = None
             try:
                 rtd = tempfile.mkdtemp(dir=target_etc)
-                tmp = os.path.join(rtd, "resolv.conf")
-                os.rename(rconf, tmp)
+                if os.path.lexists(rconf):
+                    self.rc_tmp = os.path.join(rtd, "resolv.conf")
+                    os.rename(rconf, self.rc_tmp)
                 self.rconf_d = rtd
                 shutil.copy("/etc/resolv.conf", rconf)
             except Exception:
                 if rtd:
+                    # if we renamed, but failed later we need to restore
+                    if self.rc_tmp and os.path.lexists(self.rc_tmp):
+                        os.rename(os.path.join(self.rconf_d, "resolv.conf"),
+                                  rconf)
                     shutil.rmtree(rtd)
                     self.rconf_d = None
+                    self.rc_tmp = None
                 raise
 
         return self
@@ -681,7 +688,8 @@ class ChrootableTarget(object):
 
         rconf = paths.target_path(self.target, "/etc/resolv.conf")
         if self.sys_resolvconf and self.rconf_d:
-            os.rename(os.path.join(self.rconf_d, "resolv.conf"), rconf)
+            if self.rc_tmp and os.path.lexists(self.rc_tmp):
+                os.rename(os.path.join(self.rconf_d, "resolv.conf"), rconf)
             shutil.rmtree(self.rconf_d)
 
     def subp(self, *args, **kwargs):
@@ -898,8 +906,9 @@ def sanitize_source(source):
     if type(source) is dict:
         # already sanitized?
         return source
-    supported = ['tgz', 'dd-tgz', 'dd-tbz', 'dd-txz', 'dd-tar', 'dd-bz2',
-                 'dd-gz', 'dd-xz', 'dd-raw', 'fsimage', 'fsimage-layered']
+    supported = ['tgz', 'dd-tgz', 'tbz', 'dd-tbz', 'txz', 'dd-txz', 'dd-tar',
+                 'dd-bz2', 'dd-gz', 'dd-xz', 'dd-raw', 'fsimage',
+                 'fsimage-layered']
     deftype = 'tgz'
     for i in supported:
         prefix = i + ":"
@@ -907,8 +916,14 @@ def sanitize_source(source):
             return {'type': i, 'uri': source[len(prefix):]}
 
     # translate squashfs: to fsimage type.
-    if source.startswith("squashfs:"):
-        return {'type': 'fsimage', 'uri': source[len("squashfs:")]}
+    if source.startswith("squashfs://"):
+        return {'type': 'fsimage', 'uri': source[len("squashfs://"):]}
+
+    elif source.startswith("squashfs:"):
+        LOG.warning("The squashfs: prefix is deprecated and"
+                    "will be removed in a future release."
+                    "Please use squashfs:// instead.")
+        return {'type': 'fsimage', 'uri': source[len("squashfs:"):]}
 
     if source.endswith("squashfs") or source.endswith("squash"):
         return {'type': 'fsimage', 'uri': source}
diff --git a/debian/changelog b/debian/changelog
index 92272dc..dd9a490 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,84 @@
+curtin (19.3-17-g50ffca46-0ubuntu1~16.04.1) xenial; urgency=medium
+
+  * New upstream snapshot. (LP: #1861452)
+    - clear-holders: ensure we wipe device even if multipath enabled not not mp
+    - block_meta: use reliable fs_spec entries for block devices
+    - multipath: handle removal of multipath partitions correctly
+    - vmtests: skip Focal deploying Centos70 ScsiBasic
+    - vmtests: fix network mtu tests, separating ifupdown vs networkd
+    - doc: Fix kexec documentation bug. [Mike Pontillo]
+    - vmtests: Add Focal Fossa
+    - centos: Add centos/rhel 8 support, enable UEFI Secure Boot [Lee Trager]
+    - Bump XFS /boot skip-by date out a while
+    - vmtest: Fix a missing unset of OUTPUT_FSTAB
+    - curthooks: handle s390x/aarch64 kernel install hooks
+    - clear-holders: handle arbitrary order of devices to clear
+    - curthooks: only run update-initramfs in target once
+    - test_network_mtu: bump fixby date for MTU tests
+    - block-discover: don't skip partitions on virtual devices
+    - block-discover: handle partial probe data
+    - Fix parsing of squashfs: uri prefix for installation sources [Daniel Fox]
+    - Release 19.3
+    - Update HACKING.rst with Josh Powers contact info.
+    - t/jenkins-runner: replace $EPOCHSECONDS with 'date +%s' [Paride Legovini]
+    - curthooks: skip setup_kernel_img_conf on eoan and newer
+    - block_meta: use lookup for wwn, fix fallback from wwn, serial, path
+    - vmtest: Adjust TestScsiBasic to use dnames to find correct disk
+    - schema: Add ptable value 'unsupported'
+    - tools/xkvm: add -nographic to speed up devopt query
+    - test_block_dasd: fix random_device_id to only generate valid IDs
+    - vmtest: update skip_if_arch message
+    - Add skip_by_date to eoan ipv6 vlan test
+    - storage_config: interpret value, not presence, of
+      DM_MULTIPATH_DEVICE_PATH [Michael Hudson-Doyle]
+    - vmtest: Add skip_by_date for test_ip_output on eoan + vlans
+    - block-schema: update raid schema for preserve and metadata
+    - dasd: update partition table value to 'vtoc'
+    - clear-holders: increase the level for devices with holders by one
+    - tests: mock timestamp used in collect-log file creation
+    - ChrootableTarget: mount /run to resolve lvm/mdadm issues which
+      require it.
+    - block-discover: handle multipath disks
+    - Handle partial raid on partitions
+    - install: export zpools if present in the storage-config
+    - block-schema: allow 'mac' as partition table type
+    - jenkins-runner: disable the lockfile timeout by default [Paride Legovini]
+    - curthooks: use correct grub-efi package name on i386
+    - vmtest-sync-images: remove unused imports [Paride Legovini]
+    - vmtests: use file locking on the images [Paride Legovini]
+    - vmtest: enable arm64 [Paride Legovini]
+    - Make the vmtests/test_basic test suite run on ppc64el [Paride Legovini]
+    - vmtests: separate arch and target_arch in tests [Paride Legovini]
+    - vmtests: new decorator: skip_if_arch [Paride Legovini]
+    - vmtests: increase the VM memory for Bionic
+    - vmtests: Skip Eoan ZFS Root tests until bug fix is complete
+    - util: add support for 'tbz', 'txz' tar format types to sanitize_source
+    - net: ensure eni helper tools install if given netplan config
+    - d/control: update Depends for new probert package names
+      [Dimitri John Ledkov]
+    - vmtest: fix typo in EoanBcacheBasic test name
+    - storage schema: Update nvme wwn regex to allow for nvme wwid format
+    - Allow EUI-64 formatted WWNs for disks and accept NVMe partition naming
+      [Reed Slaby]
+    - Makefile: split Python 2 and Python 3 unittest targets apart
+    - Switch to the new btrfs-progs package name, with btrfs-tools fallback.
+      [Dimitri John Ledkov]
+    - vmtest: bump ram size on Zfs tests for Disco and Eoan
+    - vmtest: drop Cosmic test cases
+    - unittests: mock subp in ChrootableTarget _exit_ test cases
+    - util.ChrootableTarget: skip rename of resolv.conf if not present
+      in target
+    - Release 19.2
+    - storage_config: a missing ID_PART_TABLE_TYPE key means no ptable
+      [Michael Hudson-Doyle]
+    - vmtests: drop skip_by_date decorators for bug 1813228
+    - block: Add opportunistic zkey encryption if supported
+    - vmtests: add support for CURTIN_VMTEST_APT_PROXY
+    - vmtests: add use of CURTIN_VMTEST_ prefixed envvars to image sync
+    - vmtest: dont raise SkipTest in class definition
+
+ -- Ryan Harper <[e-mail]>  Thu, 30 Jan 2020 13:55:17 -0600
+
 curtin (19.1-7-g37a7a0f4-0ubuntu1~16.04.1) xenial; urgency=medium
 
   * d/control: drop probert dependency for Xenial (LP: #1831757)
diff --git a/debian/control b/debian/control
index 305bbd7..97e496a 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Package: curtin
 Architecture: all
 Priority: extra
 Depends: bcache-tools,
-         btrfs-tools,
+         btrfs-progs | btrfs-tools,
          dosfstools,
          file,
          gdisk,
diff --git a/doc/topics/config.rst b/doc/topics/config.rst
index b7cca43..59e71f3 100644
--- a/doc/topics/config.rst
+++ b/doc/topics/config.rst
@@ -393,7 +393,8 @@ Enable rebooting with kexec.
 
 **Example**::
 
-  kexec: on
+  kexec:
+    mode: "on"
 
 
 multipath
@@ -555,6 +556,7 @@ configures the method used to copy the image to the target system.
 - **dd-**:  Use ``dd`` command to write image to target.
 - **cp://**: Use ``rsync`` command to copy source directory to target.
 - **file://**: Use ``tar`` command to extract source to target.
+- **squashfs://**: Mount squashfs image and copy contents to target.
 - **http[s]://**: Use ``wget | tar`` commands to extract source to target.
 - **fsimage://** mount filesystem image and copy contents to target.
   Local file or url are supported. Filesystem can be any filesystem type
@@ -649,6 +651,9 @@ This results in Curtin downloading the following URLs::
   sources: 
     - cp:///
 
+**Example squashfs from NFS mount**::
+  sources:
+    - squashfs:///media/filesystem.squashfs
 
 **Example Copy from local tarball**::
 
diff --git a/doc/topics/integration-testing.rst b/doc/topics/integration-testing.rst
index 0a66421..35a5bee 100644
--- a/doc/topics/integration-testing.rst
+++ b/doc/topics/integration-testing.rst
@@ -124,12 +124,19 @@ Environment Variables
 
 Some environment variables affect the running of vmtest
 
-- ``apt_proxy``:
+- ``CURTIN_VMTEST_APT_PROXY``:
 
-    test will set apt: { proxy } in the guests to the value of ``apt_proxy``
-    environment variable.  If that is not set it will look at the host's apt
-    config and read ``Acquire::HTTP::Proxy``. This can be prevented by
-    setting ``apt_proxy`` to the empty string; in this case no proxy is used.
+    test will set apt: { proxy } in the guests to the value of
+    ``CURTIN_VMTEST_APT_PROXY`` environment variable.  If that is not
+    set it will look at the host's apt config and read
+    ``Acquire::HTTP::Proxy``. This can be prevented by setting
+    ``CURTIN_VMTEST_APT_PROXY`` to the empty string; in this case no
+    proxy is used.
+
+    .. note::
+      For compatibility, the ``apt_proxy`` environment variable is
+      supported, with the same behaviour as described above.  If both
+      are present, ``CURTIN_VMTEST_APT_PROXY`` will be preferred.
 
 - ``CURTIN_VMTEST_CURTIN_EXE``: Defaults to ''
 
@@ -226,7 +233,7 @@ Some environment variables affect the running of vmtest
     Allow environment to override the number of virtual cpus to allocate
     in the target virtual machines.
 
-- ``IMAGE_DIR``: default /srv/images
+- ``CURTIN_VMTEST_IMAGE_DIR``: default /srv/images
 
   Vmtest keeps a mirror of maas ephemeral images in this directory.
 
diff --git a/doc/topics/storage.rst b/doc/topics/storage.rst
index a1346e9..c85174d 100644
--- a/doc/topics/storage.rst
+++ b/doc/topics/storage.rst
@@ -110,7 +110,7 @@ These ``label`` values are reserved and cannot be used:
 **disk_layout**: *cdl, ldl*
 
 The default ``disk_layout`` value is ``cdl``, the compaible disk layout which
-allows for up to 3 partitions and a MBR.  The ``ldl``, Linux layout has only
+allows for up to 3 partitions and a VTOC.  The ``ldl``, Linux layout has only
 one partition.
 
 
@@ -125,7 +125,7 @@ one partition.
    mode: full
  - id: disk0
    type: disk
-   ptable: mbr
+   ptable: vtoc
    serial: 0X1520
    name: root_disk
    wipe: superblock
@@ -278,6 +278,14 @@ and determine which device to use as a boot disk.  In cases where the boot
 device is on a special volume, such as a RAID array or a LVM Logical Volume,
 it may be necessary to specify the device that will hold the grub bootloader.
 
+**multipath**: *<multipath name or serial>*
+
+If a disk is a path in a multipath device, it may be included in the
+configuration dictionary.  Currently the value is informational only.
+Curtin already detects whether disks are part of a multipath and selects
+one member path to operate upon.
+
+
 **Config Example**::
 
  - id: disk0
@@ -374,6 +382,13 @@ For partitions, the udev rule created relies upon disk contents, in this case
 the partition entry UUID.  This will remain in effect unless the underlying disk
 on which the partition resides has the partition table modified or wiped.
 
+**multipath**: *<multipath name or serial>*
+
+If a partition is found on a multipath device, it may be included in the
+configuration dictionary.  Currently the value is informational only.
+Curtin already detects whether partitions are part of a multipath and selects
+one member path to operate upon.
+
 
 **Config Example**::
 
diff --git a/examples/tests/basic-dasd.yaml b/examples/tests/basic-dasd.yaml
index 62efbf0..3b0ba0d 100644
--- a/examples/tests/basic-dasd.yaml
+++ b/examples/tests/basic-dasd.yaml
@@ -11,14 +11,14 @@ storage:
       - id: sda
         type: disk
         wipe: superblock
-        ptable: msdos
+        ptable: vtoc
         model: QEMU HARDDISK
         serial: disk-a
         grub_device: true
       - id: dasdb
         type: disk
         wipe: superblock
-        ptable: msdos
+        ptable: vtoc
         serial: 0X1520
         wipe: superblock
       - id: sda-part1
diff --git a/examples/tests/bcache-ceph-nvme-simple.yaml b/examples/tests/bcache-ceph-nvme-simple.yaml
new file mode 100644
index 0000000..83cb04c
--- /dev/null
+++ b/examples/tests/bcache-ceph-nvme-simple.yaml
@@ -0,0 +1,107 @@
+storage:
+    config:
+    -   grub_device: true
+        id: sda
+        model: MM1000GBKAL
+        name: sda
+        ptable: gpt
+        serial: disk-a
+        type: disk
+        wipe: superblock
+    -   id: sdb
+        model: MM1000GBKAL
+        name: sdb
+        serial: disk-b
+        type: disk
+        wipe: superblock
+    -   id: nvme0n1
+        model: INTEL SSDPEDME400G4
+        name: nvme0n1
+        serial: nvme-CVMD552400
+        type: disk
+        wipe: superblock
+    -   backing_device: sdb
+        cache_device: nvme0n1
+        cache_mode: writeback
+        id: bcache1
+        name: bcache1
+        type: bcache
+    -   device: sda
+        id: sda-part1
+        name: sda-part1
+        number: 1
+        offset: 4194304B
+        size: 5G
+        type: partition
+        uuid: 1e27e7af-26dc-4af4-9ef5-aea928204997
+        wipe: superblock
+    -   device: sda
+        id: sda-part2
+        name: sda-part2
+        number: 2
+        size: 2G
+        type: partition
+        uuid: 0040d622-41f1-4596-842f-82d731ba9054
+        wipe: superblock
+    -   device: sda
+        id: sda-part3
+        name: sda-part3
+        number: 3
+        size: 2G
+        type: partition
+        uuid: cb59d827-662c-4da6-b1ef-7967218bd0db
+        wipe: superblock
+    -   backing_device: sda-part3
+        cache_device: nvme0n1
+        cache_mode: writeback
+        id: bcache0
+        name: bcache0
+        type: bcache
+    -   fstype: fat32
+        id: sda-part1_format
+        label: efi
+        type: format
+        uuid: 27638478-d881-43e5-a93c-1cac7aa60daa
+        volume: sda-part1
+    -   fstype: ext4
+        id: sda-part2_format
+        label: boot
+        type: format
+        uuid: cfd11d4f-d77f-4307-b372-b52e81c873f7
+        volume: sda-part2
+    -   fstype: ext4
+        id: bcache0_format
+        label: root
+        type: format
+        uuid: 63247841-195c-4939-83e4-cb834d61f95f
+        volume: bcache0
+    -   devices:
+        - bcache1
+        id: ceph-bcache-vg
+        name: ceph-bcache-vg
+        type: lvm_volgroup
+    -   id: ceph-bcache-lv-0
+        name: ceph-bcache-lv-0
+        size: 3G
+        type: lvm_partition
+        volgroup: ceph-bcache-vg
+    -   fstype: xfs
+        id: ceph-bcache-lv-0_format
+        volume: ceph-bcache-lv-0
+        type: format
+    -   device: bcache0_format
+        id: bcache0_mount
+        options: ''
+        path: /
+        type: mount
+    -   device: sda-part2_format
+        id: sda-part2_mount
+        options: ''
+        path: /boot
+        type: mount
+    -   device: sda-part1_format
+        id: sda-part1_mount
+        options: ''
+        path: /boot/efi
+        type: mount
+    version: 1
diff --git a/examples/tests/bcache-wipe-xfs.yaml b/examples/tests/bcache-wipe-xfs.yaml
index 558d442..1a181a8 100644
--- a/examples/tests/bcache-wipe-xfs.yaml
+++ b/examples/tests/bcache-wipe-xfs.yaml
@@ -6,9 +6,10 @@ early_commands:
   # would be seen as soon as the disk was partitioned and cause problems
   # for curtin's use of the disk.
   # This config recreates issue LP: #1718699
-  00_blockmeta: [env, -u, OUTPUT_FSTAB, TARGET_MOUNT_POINT=/tmp/my.bdir/target,
-              WORKING_DIR=/tmp/my.bdir/work.d, curtin, --showtrace, -v,
-              block-meta, --umount, custom]
+  00_blockmeta: [env, OUTPUT_FSTAB=/tmp/my.bdir/state/fstab,
+                 TARGET_MOUNT_POINT=/tmp/my.bdir/target,
+                 WORKING_DIR=/tmp/my.bdir/work.d, curtin, --showtrace, -v,
+                 block-meta, --umount, custom]
   01_clear_holders: [curtin, clear-holders, --preserve, /dev/disk/by-id/virtio-disk-b]
   02_quick_erase: [curtin, block-wipe, --mode, superblock, /dev/disk/by-id/virtio-disk-b]
 
diff --git a/examples/tests/bridging_network_v2.yaml b/examples/tests/bridging_network_v2.yaml
new file mode 100644
index 0000000..b208972
--- /dev/null
+++ b/examples/tests/bridging_network_v2.yaml
@@ -0,0 +1,38 @@
+# v2 equivalent of examples/tests/bridging_network.yaml
+showtrace: true
+network:
+    version: 2
+    ethernets:
+        eth0:
+            dhcp4: true
+            match:
+                macaddress: '52:54:00:12:34:00'
+            set-name: eth0
+        eth1:
+            match:
+                macaddress: '52:54:00:12:34:02'
+            set-name: eth1
+        eth2:
+            match:
+                macaddress: '52:54:00:12:34:04'
+            set-name: eth2
+    bridges:
+        br0:
+            addresses:
+            - 192.168.14.2/24
+            interfaces:
+            - eth1
+            - eth2
+            parameters:
+                ageing-time: 250
+                forward-delay: 1
+                hello-time: 1
+                max-age: 10
+                path-cost:
+                    eth1: 50
+                    eth2: 75
+                port-priority:
+                    eth1: 28
+                    eth2: 14
+                priority: 22
+                stp: false
diff --git a/examples/tests/dirty_disks_config.yaml b/examples/tests/dirty_disks_config.yaml
index bcf3fbc..2f86f9e 100644
--- a/examples/tests/dirty_disks_config.yaml
+++ b/examples/tests/dirty_disks_config.yaml
@@ -22,6 +22,13 @@ bucket:
     done
     swapon --show
     exit 0
+  - &multipath_on |
+      #!/bin/sh
+      if command -v multipath; then
+          multipath -ll
+          multipath -r
+          multipath -ll
+      fi
   - &zpool_export |
       #!/bin/sh
       # disable any rpools to trigger disks with zfs_member label but inactive
@@ -75,11 +82,12 @@ early_commands:
   # the disks exactly as in this config before the rest of the install
   # will just blow it all away.  We have clean out other environment
   # that could unintentionally mess things up.
-  01-blockmeta: [env, -u, OUTPUT_FSTAB,
+  01-blockmeta: [env, OUTPUT_FSTAB=/tmp/my.bdir/state/fstab,
               TARGET_MOUNT_POINT=/tmp/my.bdir/target,
               WORKING_DIR=/tmp/my.bdir/work.d,
               curtin, --showtrace, -v, block-meta, --umount, custom]
   02-enable_swaps: [sh, -c, *swapon]
+  02-multipath_on: [sh, -c, *multipath_on]
   03-disable_rpool: [sh, -c, *zpool_export]
   04-lvm_stop: [sh, -c, *lvm_stop]
   05-mdadm_stop: [sh, -c, *mdadm_stop]
diff --git a/examples/tests/network_mtu_networkd.yaml b/examples/tests/network_mtu_networkd.yaml
new file mode 100644
index 0000000..e2ac444
--- /dev/null
+++ b/examples/tests/network_mtu_networkd.yaml
@@ -0,0 +1,93 @@
+showtrace: true
+network:
+    version: 1
+    config:
+        - type: physical
+          name: interface0
+          mac_address: "52:54:00:12:34:00"
+          subnets:
+              - type: static
+                address: 192.168.1.2/24
+                mtu: 1601
+              - type: static
+                address: 2001:4800:78ff:1b:be76:4eff:fe06:1000
+                netmask: 'ffff:ffff:ffff:ffff::'
+                mtu: 1501
+        - type: physical
+          name: interface1
+          mac_address: "52:54:00:12:34:02"
+          subnets:
+              - type: static
+                address: 192.168.2.2/24
+                mtu: 1501
+              - type: static
+                address: 2001:4800:78ff:1b:be76:4eff:fe06:2000
+                netmask: 'ffff:ffff:ffff:ffff::'
+                mtu: 1501
+        - type: physical
+          name: interface2
+          mac_address: "52:54:00:12:34:04"
+          subnets:
+              - type: dhcp
+        - type: physical
+          name: interface4
+          mac_address: "52:54:00:12:34:08"
+          subnets:
+              - type: static
+                address: 2001:4800:78ff:1b:be76:4eff:fe06:5000
+                netmask: 'ffff:ffff:ffff:ffff::'
+                mtu: 8900
+              - type: static
+                address: 192.168.5.2/24
+                mtu: 9000
+        - type: physical
+          name: interface5
+          mac_address: "52:54:00:12:34:0c"
+          subnets:
+              - type: static
+                address: 2001:4800:78ff:1b:be76:4eff:fe06:6000
+                netmask: 'ffff:ffff:ffff:ffff::'
+                mtu: 1480
+              - type: static
+                address: 192.168.6.2/24
+                mtu: 1480
+
+write_files:
+  capture_mtu:
+    path: '/usr/local/bin/capture-mtu'
+    permissions: '0755'
+    owner: 'root:root'
+    content: |
+      #!/bin/sh
+      for x in 0 1 2 4 5; do
+          dev_mtu=$(cat /sys/class/net/interface${x}/mtu)
+          ipv6_mtu=$(cat /proc/sys/net/ipv6/conf/interface${x}/mtu)
+          sys=$(sysctl net.ipv6.conf.interface${x}.mtu)
+          echo "WARK: interface${x} dev_mtu=$dev_mtu proc_ipv6_mtu=$ipv6_mtu"
+          echo "WARK: $sys"
+      done
+
+bucket:
+  - &networkd_debug |
+    #!/bin/sh
+    MP=$TARGET_MOUNT_POINT
+    mkdir -p "${MP}/etc/systemd/system/systemd-networkd.service.d"
+    conf="${MP}/etc/systemd/system/systemd-networkd.service.d/10-debug.conf"
+    echo "[Service]" >$conf
+    echo "Environment=SYSTEMD_LOG_LEVEL=debug" >>$conf
+    echo "ExecStartPost=/usr/local/bin/capture-mtu" >>$conf
+    exit 0
+
+  - &capture_mtu |
+    #!/bin/sh -x
+    MP=$TARGET_MOUNT_POINT
+    for service in cloud-init-local cloud-init cloud-config; do
+        mkdir -p "${MP}/etc/systemd/system/${service}.service.d"
+        conf="${MP}/etc/systemd/system/${service}.service.d/10-debug.conf"
+        echo "[Service]" >$conf
+        echo "ExecStartPre=/usr/local/bin/capture-mtu" >>$conf
+    done
+
+late_commands:
+  01-networkd_debug: [sh, -c, *networkd_debug]
+  02-capture_mtu: [sh, -c, *capture_mtu]
diff --git a/examples/tests/reuse-raid-member-partition.yaml b/examples/tests/reuse-raid-member-partition.yaml
new file mode 100644
index 0000000..3fe2d83
--- /dev/null
+++ b/examples/tests/reuse-raid-member-partition.yaml
@@ -0,0 +1,73 @@
+showtrace: true
+
+# The point of this test is to test installing to a partition that used to
+# be a RAID member where the other disks that used to be part of the
+# RAID are not present (the scenario that the disk was just grabbed
+# out of a pile of previously used disks and shoved into a server).
+
+# So what it does is to create a RAID0 out of two partition from two
+# disks, stop the RAID, wipe one of the disks and then install to the
+# other, reusing the partition that was part of the RAID.
+
+bucket:
+  - &setup |
+    parted /dev/disk/by-id/virtio-disk-a --script -- \
+        mklabel gpt              \
+        mkpart primary 1GiB 2GiB \
+        mkpart primary 2GiB 9GiB
+    parted /dev/disk/by-id/virtio-disk-b --script -- \
+        mklabel gpt              \
+        mkpart primary 2GiB 9GiB
+    udevadm settle
+    mdadm --create --metadata 1.2 --level 0 -n 2 /dev/md1 --assume-clean \
+        /dev/disk/by-id/virtio-disk-a-part2 /dev/disk/by-id/virtio-disk-b-part1
+    udevadm settle
+    mdadm --stop /dev/md1
+    udevadm settle
+    mdadm --zero-superblock /dev/disk/by-id/virtio-disk-b-part1
+    wipefs -a /dev/disk/by-id/virtio-disk-b
+    udevadm settle
+
+early_commands:
+  00-setup-raid: [sh, -exuc, *setup]
+
+storage:
+  config:
+  - type: disk
+    id: id_disk0
+    serial: disk-a
+    ptable: gpt
+    preserve: true
+  - type: disk
+    id: id_disk1
+    serial: disk-b
+  - type: partition
+    id: id_disk0_part1
+    preserve: true
+    device: id_disk0
+    flag: boot
+    number: 1
+    size: 1G
+  - type: partition
+    id: id_disk0_part2
+    preserve: true
+    device: id_disk0
+    number: 2
+    size: 7G
+  - type: format
+    id: id_efi_format
+    volume: id_disk0_part1
+    fstype: fat32
+  - type: format
+    id: id_root_format
+    volume: id_disk0_part2
+    fstype: ext4
+  - type: mount
+    device: id_root_format
+    id: id_root_mount
+    path: /
+  - type: mount
+    id: id_efi_mount
+    device: id_efi_format
+    path: /boot/efi
+  version: 1
diff --git a/examples/tests/reuse-raid-member-wipe.yaml b/examples/tests/reuse-raid-member-wipe.yaml
new file mode 100644
index 0000000..84a2686
--- /dev/null
+++ b/examples/tests/reuse-raid-member-wipe.yaml
@@ -0,0 +1,71 @@
+showtrace: true
+
+# The point of this test is to test installing to a disk that contains
+# a partition that used to be a RAID member where the other parts of
+# the RAID are not present (the scenario is that the disk was just
+# grabbed out of a pile of previously used disks and shoved into a
+# server).
+
+# So what it does is to create a RAID0 out of partitions on two disks,
+# stop the RAID, wipe the superblock on one of them and then install
+# to the other using a standard partitioning scheme.
+
+bucket:
+  - &setup |
+    parted /dev/disk/by-id/virtio-disk-a --script -- \
+        mklabel gpt              \
+        mkpart primary 1GiB 9GiB
+    parted /dev/disk/by-id/virtio-disk-b --script -- \
+        mklabel gpt              \
+        mkpart primary 1GiB 9GiB
+    udevadm settle
+    mdadm --create --metadata 1.2 --level 0 -n 2 /dev/md1 --assume-clean \
+        /dev/disk/by-id/virtio-disk-a-part1 /dev/disk/by-id/virtio-disk-b-part1
+    udevadm settle
+    mdadm --stop /dev/md1
+    udevadm settle
+    mdadm --zero-superblock /dev/disk/by-id/virtio-disk-b-part1
+    wipefs -a /dev/disk/by-id/virtio-disk-b
+    udevadm settle
+
+early_commands:
+  00-setup-raid: [sh, -exuc, *setup]
+
+storage:
+  config:
+  - type: disk
+    id: id_disk0
+    serial: disk-a
+    ptable: gpt
+    wipe: superblock-recursive
+  - type: disk
+    id: id_disk1
+    serial: disk-b
+  - type: partition
+    id: id_disk0_part1
+    device: id_disk0
+    flag: boot
+    number: 1
+    size: 512M
+  - type: partition
+    id: id_disk0_part2
+    device: id_disk0
+    number: 2
+    size: 8G
+  - type: format
+    id: id_efi_format
+    volume: id_disk0_part1
+    fstype: fat32
+  - type: format
+    id: id_root_format
+    volume: id_disk0_part2
+    fstype: ext4
+  - type: mount
+    device: id_root_format
+    id: id_root_mount
+    path: /
+  - type: mount
+    id: id_efi_mount
+    device: id_efi_format
+    path: /boot/efi
+  version: 1
diff --git a/helpers/common b/helpers/common
index 5928150..6c8e4f0 100644
--- a/helpers/common
+++ b/helpers/common
@@ -679,7 +679,7 @@ install_grub() {
 
     # grub is not the bootloader you are looking for
     if [ "${target_arch}" = "s390x" ]; then
-	    return 0;
+        return 0;
     fi
 
     # set correct grub package
@@ -694,7 +694,7 @@ install_grub() {
         x86_64)
             case $rhel_ver in
                6) grub_name="grub";;
-               7) grub_name="grub2-pc";;
+               7|8) grub_name="grub2-pc";;
                *)
                    error "Unknown rhel_ver [$rhel_ver]";
                    return 1;
@@ -711,7 +711,10 @@ install_grub() {
         case "$target_arch" in
             x86_64)
                 # centos 7+, no centos6 support
-                grub_name="grub2-efi-x64-modules"
+                # grub2-efi-x64 installs a signed grub bootloader while
+                # curtin uses grub2-efi-x64-modules to generate grubx64.efi.
+                # Either works just check that one of them is installed.
+                grub_name="grub2-efi-x64 grub2-efi-x64-modules"
                 grub_target="x86_64-efi"
                 ;;
             amd64)
@@ -739,11 +742,13 @@ install_grub() {
         error "failed to check if $grub_name installed";
         return 1;
     fi
-    case "$tmp" in
-        install\ ok\ installed) :;;
-        *) debug 1 "$grub_name not installed, not doing anything";
-            return 1;;
-    esac
+    # Check that any of the packages in $grub_name are installed. If
+    # grub_name contains multiple packages, as it does for CentOS 7+,
+    # only one package has to be installed for this to pass.
+    if ! echo $tmp | grep -q 'install ok installed'; then
+        debug 1 "$grub_name not installed, not doing anything"
+        return 1
+    fi
 
     local grub_d="etc/default/grub.d"
     # ubuntu writes to /etc/default/grub.d/50-curtin-settings.cfg
@@ -822,11 +827,31 @@ install_grub() {
         if [ "$update_nvram" -ge 1 ]; then
             nvram=""
         fi
+        if [ "${#grubdevs_new[@]}" -eq 1 ] && [ -f "${grubdevs_new[0]}" ]; then
+            # Currently UEFI can only be pointed to one system partition. If
+            # for some reason multiple install locations are given only use the
+            # first.
+            efi_dev="${grubdevs_new[0]}"
+        elif [ "${#grubdevs_new[@]}" -gt 1 ]; then
+            error "Only one grub device supported on UEFI!"
+            exit 1
+        else
+            # If no storage configuration was given try to determine the system
+            # partition.
+            efi_dev=$(awk -v "MP=${mp}/boot/efi" '$2 == MP { print $1 }' /proc/mounts)
+        fi
+        # The partition number of block device name need to be determined here
+        # so both getting the UEFI device from Curtin config and discovering it
+        # work.
+        efi_part_num=$(cat /sys/class/block/$(basename $efi_dev)/partition)
+        efi_disk="/dev/$(lsblk -no pkname $efi_dev)"
         debug 1 "curtin uefi: installing ${grub_name} to: /boot/efi"
         chroot "$mp" env DEBIAN_FRONTEND=noninteractive sh -exc '
             echo "before grub-install efiboot settings"
             efibootmgr -v || echo "WARN: efibootmgr exited $?"
             bootid="$4"
+            efi_disk="$5"
+            efi_part_num="$6"
             grubpost=""
             case $bootid in
                 debian|ubuntu)
@@ -836,7 +861,15 @@ install_grub() {
                     ;;
                 centos|redhat|rhel)
                     grubcmd="grub2-install"
-                    grubpost="grub2-mkconfig -o /boot/grub2/grub.cfg"
+                    # RHEL uses redhat instead of the os_variant rhel for the bootid.
+                    if [ "$bootid" = "rhel" ]; then
+                        bootid="redhat"
+                    fi
+                    if [ -f /boot/efi/EFI/$bootid/grubx64.efi ]; then
+                        grubpost="grub2-mkconfig -o /boot/efi/EFI/$bootid/grub.cfg"
+                    else
+                        grubpost="grub2-mkconfig -o /boot/grub2/grub.cfg"
+                    fi
                     ;;
                 *)
                     echo "Unsupported OS: $bootid" 1>&2
@@ -852,10 +885,45 @@ install_grub() {
             echo "$gi_out" | grep -q -- "$no_nvram" || no_nvram=""
             echo "$gi_out" | grep -q -- "--target" || target=""
             echo "$gi_out" | grep -q -- "--efi-directory" || efi_dir=""
-            $grubcmd $target $efi_dir \
-                --bootloader-id=$bootid --recheck $no_nvram
+
+            # Do not overwrite grubx64.efi if it already exists. grub-install
+            # generates grubx64.efi and overwrites any existing binary in
+            # /boot/efi/EFI/$bootid. This binary is not signed and will cause
+            # secure boot to fail.
+            #
+            # CentOS, RHEL, Fedora ship the signed boot loader in the package
+            # grub2-efi-x64 which installs the signed boot loader to
+            # /boot/efi/EFI/$bootid/grubx64.efi. All Curtin has to do is
+            # configure the firmware. This mirrors what Anaconda does.
+            #
+            # Debian and Ubuntu come with a patched version of grub which
+            # add the install flag --uefi-secure-boot which is enabled by
+            # default. When enabled if a signed version of grub exists on
+            # the filesystem it will be copied into /boot/efi/EFI/$bootid.
+            # Stock Ubuntu images do not ship with anything in /boot. Those
+            # files are generated by installing a kernel and grub.
+            if [ -f /boot/efi/EFI/$bootid/grubx64.efi ]; then
+                if [ -z "$no_nvram" ]; then
+                    # UEFI firmware should be pointed to the shim if available to
+                    # enable secure boot.
+                    for boot_uefi in \
+                            /boot/efi/EFI/$bootid/shimx64.efi \
+                            /boot/efi/EFI/BOOT/BOOTX64.EFI \
+                            /boot/efi/EFI/$bootid/grubx64.efi; do
+                        if [ -f $boot_uefi ]; then
+                            break
+                        fi
+                    done
+                    loader=$(echo ${boot_uefi##/boot/efi} | sed "s|/|\\\|g")
+                    efibootmgr --create --write-signature --label $bootid \
+                        --disk $efi_disk --part $efi_part_num --loader $loader
+                fi
+            else
+                $grubcmd $target $efi_dir \
+                    --bootloader-id=$bootid --recheck $no_nvram
+            fi
             [ -z "$grubpost" ] || $grubpost;' \
-            -- "${grub_name}" "${grub_target}" "$nvram" "$os_variant" </dev/null ||
+            -- "$grub_name" "$grub_target" "$nvram" "$os_variant" "$efi_disk" "$efi_part_num" </dev/null ||
             { error "failed to install grub!"; return 1; }
 
         chroot "$mp" sh -exc '
@@ -885,8 +953,11 @@ install_grub() {
                 centos|redhat|rhel)
                     case $bootver in
                         6) grubcmd="grub-install";;
-                        7) grubcmd="grub2-install"
+                        7|8) grubcmd="grub2-install"
                            grubpost="grub2-mkconfig -o /boot/grub2/grub.cfg";;
+                        *)
+                           echo "Unknown rhel_ver [$bootver]"
+                           exit 1
                     esac
                     ;;
                 *)
diff --git a/tests/data/probert_storage_multipath.json b/tests/data/probert_storage_multipath.json
new file mode 100644
index 0000000..53d9f93
--- /dev/null
+++ b/tests/data/probert_storage_multipath.json
@@ -0,0 +1,1059 @@
+{
+  "lvm": {},
+  "raid": {},
+  "filesystem": {
+    "/dev/sr0": {
+      "BOOT_SYSTEM_ID": "EL\\x20TORITO\\x20SPECIFICATION",
+      "LABEL": "Ubuntu-Server_19.10_amd64",
+      "LABEL_ENC": "Ubuntu-Server\\x2019.10\\x20amd64",
+      "TYPE": "iso9660",
+      "USAGE": "filesystem",
+      "UUID": "2019-08-11-07-41-33-00",
+      "UUID_ENC": "2019-08-11-07-41-33-00",
+      "VERSION": "Joliet Extension"
+    },
+    "/dev/sda2": {
+      "TYPE": "ext4",
+      "USAGE": "filesystem",
+      "UUID": "80ca57a0-60b7-4328-be41-afedf915effd",
+      "UUID_ENC": "80ca57a0-60b7-4328-be41-afedf915effd",
+      "VERSION": "1.0"
+    },
+    "/dev/sdb2": {
+      "TYPE": "ext4",
+      "USAGE": "filesystem",
+      "UUID": "80ca57a0-60b7-4328-be41-afedf915effd",
+      "UUID_ENC": "80ca57a0-60b7-4328-be41-afedf915effd",
+      "VERSION": "1.0"
+    },
+    "/dev/dm-2": {
+      "TYPE": "ext4",
+      "USAGE": "filesystem",
+      "UUID": "80ca57a0-60b7-4328-be41-afedf915effd",
+      "UUID_ENC": "80ca57a0-60b7-4328-be41-afedf915effd",
+      "VERSION": "1.0"
+    }
+  },
+  "mount": [
+    {
+      "target": "/",
+      "source": "/cow",
+      "fstype": "overlay",
+      "options": "rw,relatime,lowerdir=//installer.squashfs://filesystem.squashfs,upperdir=/cow/upper,workdir=/cow/work",
+      "children": [
+        {
+          "target": "/sys",
+          "source": "sysfs",
+          "fstype": "sysfs",
+          "options": "rw,nosuid,nodev,noexec,relatime",
+          "children": [
+            {
+              "target": "/sys/kernel/security",
+              "source": "securityfs",
+              "fstype": "securityfs",
+              "options": "rw,nosuid,nodev,noexec,relatime"
+            },
+            {
+              "target": "/sys/fs/cgroup",
+              "source": "tmpfs",
+              "fstype": "tmpfs",
+              "options": "ro,nosuid,nodev,noexec,mode=755",
+              "children": [
+                {
+                  "target": "/sys/fs/cgroup/unified",
+                  "source": "cgroup2",
+                  "fstype": "cgroup2",
+                  "options": "rw,nosuid,nodev,noexec,relatime,nsdelegate"
+                },
+                {
+                  "target": "/sys/fs/cgroup/systemd",
+                  "source": "cgroup",
+                  "fstype": "cgroup",
+                  "options": "rw,nosuid,nodev,noexec,relatime,xattr,name=systemd"
+                },
+                {
+                  "target": "/sys/fs/cgroup/cpu,cpuacct",
+                  "source": "cgroup",
+                  "fstype": "cgroup",
+                  "options": "rw,nosuid,nodev,noexec,relatime,cpu,cpuacct"
+                },
+                {
+                  "target": "/sys/fs/cgroup/devices",
+                  "source": "cgroup",
+                  "fstype": "cgroup",
+                  "options": "rw,nosuid,nodev,noexec,relatime,devices"
+                },
+                {
+                  "target": "/sys/fs/cgroup/perf_event",
+                  "source": "cgroup",
+                  "fstype": "cgroup",
+                  "options": "rw,nosuid,nodev,noexec,relatime,perf_event"
+                },
+                {
+                  "target": "/sys/fs/cgroup/hugetlb",
+                  "source": "cgroup",
+                  "fstype": "cgroup",
+                  "options": "rw,nosuid,nodev,noexec,relatime,hugetlb"
+                },
+                {
+                  "target": "/sys/fs/cgroup/rdma",
+                  "source": "cgroup",
+                  "fstype": "cgroup",
+                  "options": "rw,nosuid,nodev,noexec,relatime,rdma"
+                },
+                {
+                  "target": "/sys/fs/cgroup/net_cls,net_prio",
+                  "source": "cgroup",
+                  "fstype": "cgroup",
+                  "options": "rw,nosuid,nodev,noexec,relatime,net_cls,net_prio"
+                },
+                {
+                  "target": "/sys/fs/cgroup/freezer",
+                  "source": "cgroup",
+                  "fstype": "cgroup",
+                  "options": "rw,nosuid,nodev,noexec,relatime,freezer"
+                },
+                {
+                  "target": "/sys/fs/cgroup/cpuset",
+                  "source": "cgroup",
+                  "fstype": "cgroup",
+                  "options": "rw,nosuid,nodev,noexec,relatime,cpuset"
+                },
+                {
+                  "target": "/sys/fs/cgroup/memory",
+                  "source": "cgroup",
+                  "fstype": "cgroup",
+                  "options": "rw,nosuid,nodev,noexec,relatime,memory"
+                },
+                {
+                  "target": "/sys/fs/cgroup/blkio",
+                  "source": "cgroup",
+                  "fstype": "cgroup",
+                  "options": "rw,nosuid,nodev,noexec,relatime,blkio"
+                },
+                {
+                  "target": "/sys/fs/cgroup/pids",
+                  "source": "cgroup",
+                  "fstype": "cgroup",
+                  "options": "rw,nosuid,nodev,noexec,relatime,pids"
+                }
+              ]
+            },
+            {
+              "target": "/sys/fs/pstore",
+              "source": "pstore",
+              "fstype": "pstore",
+              "options": "rw,nosuid,nodev,noexec,relatime"
+            },
+            {
+              "target": "/sys/fs/bpf",
+              "source": "bpf",
+              "fstype": "bpf",
+              "options": "rw,nosuid,nodev,noexec,relatime,mode=700"
+            },
+            {
+              "target": "/sys/kernel/debug",
+              "source": "debugfs",
+              "fstype": "debugfs",
+              "options": "rw,relatime"
+            },
+            {
+              "target": "/sys/kernel/config",
+              "source": "configfs",
+              "fstype": "configfs",
+              "options": "rw,relatime"
+            },
+            {
+              "target": "/sys/fs/fuse/connections",
+              "source": "fusectl",
+              "fstype": "fusectl",
+              "options": "rw,relatime"
+            }
+          ]
+        },
+        {
+          "target": "/proc",
+          "source": "proc",
+          "fstype": "proc",
+          "options": "rw,nosuid,nodev,noexec,relatime",
+          "children": [
+            {
+              "target": "/proc/sys/fs/binfmt_misc",
+              "source": "systemd-1",
+              "fstype": "autofs",
+              "options": "rw,relatime,fd=28,pgrp=1,timeout=0,minproto=5,maxproto=5,direct,pipe_ino=13765"
+            }
+          ]
+        },
+        {
+          "target": "/dev",
+          "source": "udev",
+          "fstype": "devtmpfs",
+          "options": "rw,nosuid,relatime,size=462516k,nr_inodes=115629,mode=755",
+          "children": [
+            {
+              "target": "/dev/pts",
+              "source": "devpts",
+              "fstype": "devpts",
+              "options": "rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000"
+            },
+            {
+              "target": "/dev/shm",
+              "source": "tmpfs",
+              "fstype": "tmpfs",
+              "options": "rw,nosuid,nodev"
+            },
+            {
+              "target": "/dev/hugepages",
+              "source": "hugetlbfs",
+              "fstype": "hugetlbfs",
+              "options": "rw,relatime,pagesize=2M"
+            },
+            {
+              "target": "/dev/mqueue",
+              "source": "mqueue",
+              "fstype": "mqueue",
+              "options": "rw,relatime"
+            }
+          ]
+        },
+        {
+          "target": "/run",
+          "source": "tmpfs",
+          "fstype": "tmpfs",
+          "options": "rw,nosuid,noexec,relatime,size=100568k,mode=755",
+          "children": [
+            {
+              "target": "/run/lock",
+              "source": "tmpfs",
+              "fstype": "tmpfs",
+              "options": "rw,nosuid,nodev,noexec,relatime,size=5120k"
+            }
+          ]
+        },
+        {
+          "target": "/cdrom",
+          "source": "/dev/sr0",
+          "fstype": "iso9660",
+          "options": "ro,noatime,nojoliet,check=s,map=n,blocksize=2048"
+        },
+        {
+          "target": "/rofs",
+          "source": "/dev/loop0",
+          "fstype": "squashfs",
+          "options": "ro,noatime"
+        },
+        {
+          "target": "/usr/lib/modules",
+          "source": "/dev/loop2",
+          "fstype": "squashfs",
+          "options": "ro,relatime"
+        },
+        {
+          "target": "/media/filesystem",
+          "source": "/dev/loop0",
+          "fstype": "squashfs",
+          "options": "ro,relatime"
+        },
+        {
+          "target": "/tmp",
+          "source": "tmpfs",
+          "fstype": "tmpfs",
+          "options": "rw,nosuid,nodev,relatime"
+        },
+        {
+          "target": "/snap/core/7270",
+          "source": "/dev/loop3",
+          "fstype": "squashfs",
+          "options": "ro,nodev,relatime"
+        },
+        {
+          "target": "/snap/subiquity/1093",
+          "source": "/dev/loop4",
+          "fstype": "squashfs",
+          "options": "ro,nodev,relatime"
+        }
+      ]
+    }
+  ],
+  "multipath": {
+    "maps": [
+      {
+        "multipath": "30000000000000064",
+        "sysfs": "dm-0",
+        "paths": "2"
+      }
+    ],
+    "paths": [
+      {
+        "device": "sda",
+        "serial": "serial-a",
+        "multipath": "mpatha",
+        "host_wwnn": "[undef]",
+        "target_wwnn": "[undef]",
+        "host_wwpn": "[undef]",
+        "target_wwpn": "[undef]",
+        "host_adapter": "[undef]"
+      },
+      {
+        "device": "sdb",
+        "serial": "serial-a",
+        "multipath": "mpatha",
+        "host_wwnn": "[undef]",
+        "target_wwnn": "[undef]",
+        "host_wwpn": "[undef]",
+        "target_wwpn": "[undef]",
+        "host_adapter": "[undef]"
+      }
+    ]
+  },
+  "dmcrypt": {},
+  "blockdev": {
+    "/dev/sr0": {
+      "DEVLINKS": "/dev/disk/by-label/Ubuntu-Server\\x2019.10\\x20amd64 /dev/dvd /dev/disk/by-uuid/2019-08-11-07-41-33-00 /dev/disk/by-id/ata-QEMU_DVD-ROM_QM00003 /dev/cdrom /dev/disk/by-path/pci-0000:00:01.1-ata-2",
+      "DEVNAME": "/dev/sr0",
+      "DEVPATH": "/devices/pci0000:00/0000:00:01.1/ata2/host1/target1:0:0/1:0:0:0/block/sr0",
+      "DEVTYPE": "disk",
+      "ID_ATA": "1",
+      "ID_BUS": "ata",
+      "ID_CDROM": "1",
+      "ID_CDROM_DVD": "1",
+      "ID_CDROM_MEDIA": "1",
+      "ID_CDROM_MEDIA_CD": "1",
+      "ID_CDROM_MEDIA_SESSION_COUNT": "1",
+      "ID_CDROM_MEDIA_TRACK_COUNT": "1",
+      "ID_CDROM_MEDIA_TRACK_COUNT_DATA": "1",
+      "ID_CDROM_MRW": "1",
+      "ID_CDROM_MRW_W": "1",
+      "ID_FOR_SEAT": "block-pci-0000_00_01_1-ata-2",
+      "ID_FS_BOOT_SYSTEM_ID": "EL\\x20TORITO\\x20SPECIFICATION",
+      "ID_FS_LABEL": "Ubuntu-Server_19.10_amd64",
+      "ID_FS_LABEL_ENC": "Ubuntu-Server\\x2019.10\\x20amd64",
+      "ID_FS_TYPE": "iso9660",
+      "ID_FS_USAGE": "filesystem",
+      "ID_FS_UUID": "2019-08-11-07-41-33-00",
+      "ID_FS_UUID_ENC": "2019-08-11-07-41-33-00",
+      "ID_FS_VERSION": "Joliet Extension",
+      "ID_MODEL": "QEMU_DVD-ROM",
+      "ID_MODEL_ENC": "QEMU\\x20DVD-ROM\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20\\x20",
+      "ID_PART_TABLE_TYPE": "dos",
+      "ID_PART_TABLE_UUID": "6612a5ed",
+      "ID_PATH": "pci-0000:00:01.1-ata-2",
+      "ID_PATH_TAG": "pci-0000_00_01_1-ata-2",
+      "ID_REVISION": "2.5+",
+      "ID_SCSI": "1",
+      "ID_SCSI_INQUIRY": "1",
+      "ID_SERIAL": "QEMU_DVD-ROM_QM00003",
+      "ID_SERIAL_SHORT": "QM00003",
+      "ID_TYPE": "cd",
+      "ID_VENDOR": "QEMU",
+      "ID_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "MAJOR": "11",
+      "MINOR": "0",
+      "SCSI_MODEL": "QEMU_DVD-ROM",
+      "SCSI_MODEL_ENC": "QEMU\\x20DVD-ROM\\x20\\x20\\x20\\x20",
+      "SCSI_REVISION": "2.5+",
+      "SCSI_TPGS": "0",
+      "SCSI_TYPE": "cd/dvd",
+      "SCSI_VENDOR": "QEMU",
+      "SCSI_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "SUBSYSTEM": "block",
+      "SYSTEMD_MOUNT_DEVICE_BOUND": "1",
+      "TAGS": ":systemd:uaccess:seat:",
+      "USEC_INITIALIZED": "1162968",
+      "attrs": {
+        "alignment_offset": "0",
+        "bdi": null,
+        "capability": "119",
+        "dev": "11:0",
+        "device": null,
+        "discard_alignment": "0",
+        "events": "media_change eject_request",
+        "events_async": "",
+        "events_poll_msecs": "-1",
+        "ext_range": "1",
+        "hidden": "0",
+        "inflight": "       0        0",
+        "range": "1",
+        "removable": "1",
+        "ro": "0",
+        "size": "2881486848",
+        "stat": "    3177       16   427476   210179        0        0        0        0        0     6880   207800        0        0        0        0",
+        "subsystem": "block",
+        "uevent": "MAJOR=11\nMINOR=0\nDEVNAME=sr0\nDEVTYPE=disk"
+      },
+      "partitiontable": {
+        "label": "dos",
+        "id": "0x6612a5ed",
+        "device": "/dev/sr0",
+        "unit": "sectors",
+        "partitions": [
+          {
+            "node": "/dev/sr0p1",
+            "start": 0,
+            "size": 1406976,
+            "type": "0",
+            "bootable": true
+          },
+          {
+            "node": "/dev/sr0p2",
+            "start": 790864,
+            "size": 7936,
+            "type": "ef"
+          }
+        ]
+      }
+    },
+    "/dev/sda": {
+      "DEVLINKS": "/dev/disk/by-id/scsi-30000000000000064 /dev/disk/by-path/pci-0000:00:04.0-scsi-0:0:0:0 /dev/disk/by-id/scsi-SQEMU_QEMU_HARDDISK_serial-a /dev/disk/by-id/wwn-0x0000000000000064 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_serial-a",
+      "DEVNAME": "/dev/sda",
+      "DEVPATH": "/devices/pci0000:00/0000:00:04.0/virtio0/host2/target2:0:0/2:0:0:0/block/sda",
+      "DEVTYPE": "disk",
+      "DM_DEL_PART_NODES": "1",
+      "DM_MULTIPATH_DEVICE_PATH": "1",
+      "ID_BUS": "scsi",
+      "ID_FS_TYPE": "mpath_member",
+      "ID_MODEL": "QEMU_HARDDISK",
+      "ID_MODEL_ENC": "QEMU\\x20HARDDISK\\x20\\x20\\x20",
+      "ID_PART_TABLE_TYPE": "gpt",
+      "ID_PART_TABLE_UUID": "8261cd75-2234-4dbd-920a-d21a7c083c94",
+      "ID_PATH": "pci-0000:00:04.0-scsi-0:0:0:0",
+      "ID_PATH_TAG": "pci-0000_00_04_0-scsi-0_0_0_0",
+      "ID_REVISION": "2.5+",
+      "ID_SCSI": "1",
+      "ID_SCSI_INQUIRY": "1",
+      "ID_SERIAL": "30000000000000064",
+      "ID_SERIAL_SHORT": "0000000000000064",
+      "ID_TYPE": "disk",
+      "ID_VENDOR": "QEMU",
+      "ID_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "ID_WWN": "0x0000000000000064",
+      "ID_WWN_WITH_EXTENSION": "0x0000000000000064",
+      "MAJOR": "8",
+      "MINOR": "0",
+      "MPATH_SBIN_PATH": "/sbin",
+      "SCSI_IDENT_LUN_NAA_LOCAL": "0000000000000064",
+      "SCSI_IDENT_LUN_VENDOR": "serial-a",
+      "SCSI_IDENT_SERIAL": "serial-a",
+      "SCSI_MODEL": "QEMU_HARDDISK",
+      "SCSI_MODEL_ENC": "QEMU\\x20HARDDISK\\x20\\x20\\x20",
+      "SCSI_REVISION": "2.5+",
+      "SCSI_TPGS": "0",
+      "SCSI_TYPE": "disk",
+      "SCSI_VENDOR": "QEMU",
+      "SCSI_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "SUBSYSTEM": "block",
+      "SYSTEMD_READY": "0",
+      "TAGS": ":systemd:",
+      "USEC_INITIALIZED": "1357719",
+      "attrs": {
+        "alignment_offset": "0",
+        "bdi": null,
+        "capability": "50",
+        "dev": "8:0",
+        "device": null,
+        "discard_alignment": "0",
+        "events": "",
+        "events_async": "",
+        "events_poll_msecs": "-1",
+        "ext_range": "256",
+        "hidden": "0",
+        "inflight": "       0        0",
+        "range": "16",
+        "removable": "0",
+        "ro": "0",
+        "size": "10737418240",
+        "stat": "     820        0    37338      127        0        0        0        0        0      452        4        0        0        0        0",
+        "subsystem": "block",
+        "uevent": "MAJOR=8\nMINOR=0\nDEVNAME=sda\nDEVTYPE=disk"
+      },
+      "partitiontable": {
+        "label": "gpt",
+        "id": "8261CD75-2234-4DBD-920A-D21A7C083C94",
+        "device": "/dev/sda",
+        "unit": "sectors",
+        "firstlba": 34,
+        "lastlba": 20971486,
+        "partitions": [
+          {
+            "node": "/dev/sda1",
+            "start": 2048,
+            "size": 2048,
+            "type": "21686148-6449-6E6F-744E-656564454649",
+            "uuid": "8088175C-362A-4B46-9603-F3595065FA73"
+          },
+          {
+            "node": "/dev/sda2",
+            "start": 4096,
+            "size": 20965376,
+            "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+            "uuid": "760493AC-7945-44C5-A6BD-58FCD6632EA7"
+          }
+        ]
+      }
+    },
+    "/dev/sda1": {
+      "DEVLINKS": "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_serial-a-part1 /dev/disk/by-id/scsi-30000000000000064-part1 /dev/disk/by-path/pci-0000:00:04.0-scsi-0:0:0:0-part1 /dev/disk/by-id/scsi-SQEMU_QEMU_HARDDISK_serial-a-part1 /dev/disk/by-partuuid/8088175c-362a-4b46-9603-f3595065fa73 /dev/disk/by-id/wwn-0x0000000000000064-part1",
+      "DEVNAME": "/dev/sda1",
+      "DEVPATH": "/devices/pci0000:00/0000:00:04.0/virtio0/host2/target2:0:0/2:0:0:0/block/sda/sda1",
+      "DEVTYPE": "partition",
+      "DM_MULTIPATH_DEVICE_PATH": "1",
+      "ID_BUS": "scsi",
+      "ID_FS_TYPE": "mpath_member",
+      "ID_MODEL": "QEMU_HARDDISK",
+      "ID_MODEL_ENC": "QEMU\\x20HARDDISK\\x20\\x20\\x20",
+      "ID_PART_ENTRY_DISK": "8:0",
+      "ID_PART_ENTRY_NUMBER": "1",
+      "ID_PART_ENTRY_OFFSET": "2048",
+      "ID_PART_ENTRY_SCHEME": "gpt",
+      "ID_PART_ENTRY_SIZE": "2048",
+      "ID_PART_ENTRY_TYPE": "21686148-6449-6e6f-744e-656564454649",
+      "ID_PART_ENTRY_UUID": "8088175c-362a-4b46-9603-f3595065fa73",
+      "ID_PART_TABLE_TYPE": "gpt",
+      "ID_PART_TABLE_UUID": "8261cd75-2234-4dbd-920a-d21a7c083c94",
+      "ID_PATH": "pci-0000:00:04.0-scsi-0:0:0:0",
+      "ID_PATH_TAG": "pci-0000_00_04_0-scsi-0_0_0_0",
+      "ID_REVISION": "2.5+",
+      "ID_SCSI": "1",
+      "ID_SCSI_INQUIRY": "1",
+      "ID_SERIAL": "30000000000000064",
+      "ID_SERIAL_SHORT": "0000000000000064",
+      "ID_TYPE": "disk",
+      "ID_VENDOR": "QEMU",
+      "ID_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "ID_WWN": "0x0000000000000064",
+      "ID_WWN_WITH_EXTENSION": "0x0000000000000064",
+      "MAJOR": "8",
+      "MINOR": "1",
+      "PARTN": "1",
+      "SCSI_IDENT_LUN_NAA_LOCAL": "0000000000000064",
+      "SCSI_IDENT_LUN_VENDOR": "serial-a",
+      "SCSI_IDENT_SERIAL": "serial-a",
+      "SCSI_MODEL": "QEMU_HARDDISK",
+      "SCSI_MODEL_ENC": "QEMU\\x20HARDDISK\\x20\\x20\\x20",
+      "SCSI_REVISION": "2.5+",
+      "SCSI_TPGS": "0",
+      "SCSI_TYPE": "disk",
+      "SCSI_VENDOR": "QEMU",
+      "SCSI_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "SUBSYSTEM": "block",
+      "SYSTEMD_READY": "0",
+      "TAGS": ":systemd:",
+      "USEC_INITIALIZED": "1409047",
+      "attrs": {
+        "alignment_offset": "0",
+        "dev": "8:1",
+        "discard_alignment": "0",
+        "inflight": "       0        0",
+        "partition": "1",
+        "ro": "0",
+        "size": "1048576",
+        "start": "2048",
+        "stat": "     167        0     1360       14        0        0        0        0        0      172        0        0        0        0        0",
+        "subsystem": "block",
+        "uevent": "MAJOR=8\nMINOR=1\nDEVNAME=sda1\nDEVTYPE=partition\nPARTN=1"
+      }
+    },
+    "/dev/sda2": {
+      "DEVLINKS": "/dev/disk/by-id/wwn-0x0000000000000064-part2 /dev/disk/by-id/scsi-SQEMU_QEMU_HARDDISK_serial-a-part2 /dev/disk/by-uuid/80ca57a0-60b7-4328-be41-afedf915effd /dev/disk/by-partuuid/760493ac-7945-44c5-a6bd-58fcd6632ea7 /dev/disk/by-path/pci-0000:00:04.0-scsi-0:0:0:0-part2 /dev/disk/by-id/scsi-30000000000000064-part2 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_serial-a-part2",
+      "DEVNAME": "/dev/sda2",
+      "DEVPATH": "/devices/pci0000:00/0000:00:04.0/virtio0/host2/target2:0:0/2:0:0:0/block/sda/sda2",
+      "DEVTYPE": "partition",
+      "DM_MULTIPATH_DEVICE_PATH": "1",
+      "ID_BUS": "scsi",
+      "ID_FS_TYPE": "ext4",
+      "ID_FS_USAGE": "filesystem",
+      "ID_FS_UUID": "80ca57a0-60b7-4328-be41-afedf915effd",
+      "ID_FS_UUID_ENC": "80ca57a0-60b7-4328-be41-afedf915effd",
+      "ID_FS_VERSION": "1.0",
+      "ID_MODEL": "QEMU_HARDDISK",
+      "ID_MODEL_ENC": "QEMU\\x20HARDDISK\\x20\\x20\\x20",
+      "ID_PART_ENTRY_DISK": "8:0",
+      "ID_PART_ENTRY_NUMBER": "2",
+      "ID_PART_ENTRY_OFFSET": "4096",
+      "ID_PART_ENTRY_SCHEME": "gpt",
+      "ID_PART_ENTRY_SIZE": "20965376",
+      "ID_PART_ENTRY_TYPE": "0fc63daf-8483-4772-8e79-3d69d8477de4",
+      "ID_PART_ENTRY_UUID": "760493ac-7945-44c5-a6bd-58fcd6632ea7",
+      "ID_PART_TABLE_TYPE": "gpt",
+      "ID_PART_TABLE_UUID": "8261cd75-2234-4dbd-920a-d21a7c083c94",
+      "ID_PATH": "pci-0000:00:04.0-scsi-0:0:0:0",
+      "ID_PATH_TAG": "pci-0000_00_04_0-scsi-0_0_0_0",
+      "ID_REVISION": "2.5+",
+      "ID_SCSI": "1",
+      "ID_SCSI_INQUIRY": "1",
+      "ID_SERIAL": "30000000000000064",
+      "ID_SERIAL_SHORT": "0000000000000064",
+      "ID_TYPE": "disk",
+      "ID_VENDOR": "QEMU",
+      "ID_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "ID_WWN": "0x0000000000000064",
+      "ID_WWN_WITH_EXTENSION": "0x0000000000000064",
+      "MAJOR": "8",
+      "MINOR": "2",
+      "PARTN": "2",
+      "SCSI_IDENT_LUN_NAA_LOCAL": "0000000000000064",
+      "SCSI_IDENT_LUN_VENDOR": "serial-a",
+      "SCSI_IDENT_SERIAL": "serial-a",
+      "SCSI_MODEL": "QEMU_HARDDISK",
+      "SCSI_MODEL_ENC": "QEMU\\x20HARDDISK\\x20\\x20\\x20",
+      "SCSI_REVISION": "2.5+",
+      "SCSI_TPGS": "0",
+      "SCSI_TYPE": "disk",
+      "SCSI_VENDOR": "QEMU",
+      "SCSI_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "SUBSYSTEM": "block",
+      "SYSTEMD_READY": "0",
+      "TAGS": ":systemd:",
+      "USEC_INITIALIZED": "1364238",
+      "attrs": {
+        "alignment_offset": "0",
+        "dev": "8:2",
+        "discard_alignment": "0",
+        "inflight": "       0        0",
+        "partition": "2",
+        "ro": "0",
+        "size": "10734272512",
+        "start": "4096",
+        "stat": "     268        0    17138       61        0        0        0        0        0      156        4        0        0        0        0",
+        "subsystem": "block",
+        "uevent": "MAJOR=8\nMINOR=2\nDEVNAME=sda2\nDEVTYPE=partition\nPARTN=2"
+      }
+    },
+    "/dev/sdb": {
+      "DEVLINKS": "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_serial-a /dev/disk/by-id/scsi-30000000000000064 /dev/disk/by-id/wwn-0x0000000000000064 /dev/disk/by-path/pci-0000:00:04.0-scsi-0:0:1:0 /dev/disk/by-id/scsi-SQEMU_QEMU_HARDDISK_serial-a",
+      "DEVNAME": "/dev/sdb",
+      "DEVPATH": "/devices/pci0000:00/0000:00:04.0/virtio0/host2/target2:0:1/2:0:1:0/block/sdb",
+      "DEVTYPE": "disk",
+      "DM_DEL_PART_NODES": "1",
+      "DM_MULTIPATH_DEVICE_PATH": "1",
+      "ID_BUS": "scsi",
+      "ID_FS_TYPE": "mpath_member",
+      "ID_MODEL": "QEMU_HARDDISK",
+      "ID_MODEL_ENC": "QEMU\\x20HARDDISK\\x20\\x20\\x20",
+      "ID_PART_TABLE_TYPE": "gpt",
+      "ID_PART_TABLE_UUID": "8261cd75-2234-4dbd-920a-d21a7c083c94",
+      "ID_PATH": "pci-0000:00:04.0-scsi-0:0:1:0",
+      "ID_PATH_TAG": "pci-0000_00_04_0-scsi-0_0_1_0",
+      "ID_REVISION": "2.5+",
+      "ID_SCSI": "1",
+      "ID_SCSI_INQUIRY": "1",
+      "ID_SERIAL": "30000000000000064",
+      "ID_SERIAL_SHORT": "0000000000000064",
+      "ID_TYPE": "disk",
+      "ID_VENDOR": "QEMU",
+      "ID_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "ID_WWN": "0x0000000000000064",
+      "ID_WWN_WITH_EXTENSION": "0x0000000000000064",
+      "MAJOR": "8",
+      "MINOR": "16",
+      "MPATH_SBIN_PATH": "/sbin",
+      "SCSI_IDENT_LUN_NAA_LOCAL": "0000000000000064",
+      "SCSI_IDENT_LUN_VENDOR": "serial-a",
+      "SCSI_IDENT_SERIAL": "serial-a",
+      "SCSI_MODEL": "QEMU_HARDDISK",
+      "SCSI_MODEL_ENC": "QEMU\\x20HARDDISK\\x20\\x20\\x20",
+      "SCSI_REVISION": "2.5+",
+      "SCSI_TPGS": "0",
+      "SCSI_TYPE": "disk",
+      "SCSI_VENDOR": "QEMU",
+      "SCSI_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "SUBSYSTEM": "block",
+      "SYSTEMD_READY": "0",
+      "TAGS": ":systemd:",
+      "USEC_INITIALIZED": "1342677",
+      "attrs": {
+        "alignment_offset": "0",
+        "bdi": null,
+        "capability": "50",
+        "dev": "8:16",
+        "device": null,
+        "discard_alignment": "0",
+        "events": "",
+        "events_async": "",
+        "events_poll_msecs": "-1",
+        "ext_range": "256",
+        "hidden": "0",
+        "inflight": "       0        0",
+        "range": "16",
+        "removable": "0",
+        "ro": "0",
+        "size": "10737418240",
+        "stat": "     460        0    20312       70        0        0        0        0        0      280       12        0        0        0        0",
+        "subsystem": "block",
+        "uevent": "MAJOR=8\nMINOR=16\nDEVNAME=sdb\nDEVTYPE=disk"
+      },
+      "partitiontable": {
+        "label": "gpt",
+        "id": "8261CD75-2234-4DBD-920A-D21A7C083C94",
+        "device": "/dev/sdb",
+        "unit": "sectors",
+        "firstlba": 34,
+        "lastlba": 20971486,
+        "partitions": [
+          {
+            "node": "/dev/sdb1",
+            "start": 2048,
+            "size": 2048,
+            "type": "21686148-6449-6E6F-744E-656564454649",
+            "uuid": "8088175C-362A-4B46-9603-F3595065FA73"
+          },
+          {
+            "node": "/dev/sdb2",
+            "start": 4096,
+            "size": 20965376,
+            "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+            "uuid": "760493AC-7945-44C5-A6BD-58FCD6632EA7"
+          }
+        ]
+      }
+    },
+    "/dev/sdb1": {
+      "DEVLINKS": "/dev/disk/by-path/pci-0000:00:04.0-scsi-0:0:1:0-part1 /dev/disk/by-id/scsi-30000000000000064-part1 /dev/disk/by-partuuid/8088175c-362a-4b46-9603-f3595065fa73 /dev/disk/by-id/scsi-SQEMU_QEMU_HARDDISK_serial-a-part1 /dev/disk/by-id/wwn-0x0000000000000064-part1 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_serial-a-part1",
+      "DEVNAME": "/dev/sdb1",
+      "DEVPATH": "/devices/pci0000:00/0000:00:04.0/virtio0/host2/target2:0:1/2:0:1:0/block/sdb/sdb1",
+      "DEVTYPE": "partition",
+      "DM_MULTIPATH_DEVICE_PATH": "1",
+      "ID_BUS": "scsi",
+      "ID_FS_TYPE": "mpath_member",
+      "ID_MODEL": "QEMU_HARDDISK",
+      "ID_MODEL_ENC": "QEMU\\x20HARDDISK\\x20\\x20\\x20",
+      "ID_PART_ENTRY_DISK": "8:16",
+      "ID_PART_ENTRY_NUMBER": "1",
+      "ID_PART_ENTRY_OFFSET": "2048",
+      "ID_PART_ENTRY_SCHEME": "gpt",
+      "ID_PART_ENTRY_SIZE": "2048",
+      "ID_PART_ENTRY_TYPE": "21686148-6449-6e6f-744e-656564454649",
+      "ID_PART_ENTRY_UUID": "8088175c-362a-4b46-9603-f3595065fa73",
+      "ID_PART_TABLE_TYPE": "gpt",
+      "ID_PART_TABLE_UUID": "8261cd75-2234-4dbd-920a-d21a7c083c94",
+      "ID_PATH": "pci-0000:00:04.0-scsi-0:0:1:0",
+      "ID_PATH_TAG": "pci-0000_00_04_0-scsi-0_0_1_0",
+      "ID_REVISION": "2.5+",
+      "ID_SCSI": "1",
+      "ID_SCSI_INQUIRY": "1",
+      "ID_SERIAL": "30000000000000064",
+      "ID_SERIAL_SHORT": "0000000000000064",
+      "ID_TYPE": "disk",
+      "ID_VENDOR": "QEMU",
+      "ID_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "ID_WWN": "0x0000000000000064",
+      "ID_WWN_WITH_EXTENSION": "0x0000000000000064",
+      "MAJOR": "8",
+      "MINOR": "17",
+      "PARTN": "1",
+      "SCSI_IDENT_LUN_NAA_LOCAL": "0000000000000064",
+      "SCSI_IDENT_LUN_VENDOR": "serial-a",
+      "SCSI_IDENT_SERIAL": "serial-a",
+      "SCSI_MODEL": "QEMU_HARDDISK",
+      "SCSI_MODEL_ENC": "QEMU\\x20HARDDISK\\x20\\x20\\x20",
+      "SCSI_REVISION": "2.5+",
+      "SCSI_TPGS": "0",
+      "SCSI_TYPE": "disk",
+      "SCSI_VENDOR": "QEMU",
+      "SCSI_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "SUBSYSTEM": "block",
+      "SYSTEMD_READY": "0",
+      "TAGS": ":systemd:",
+      "USEC_INITIALIZED": "1383416",
+      "attrs": {
+        "alignment_offset": "0",
+        "dev": "8:17",
+        "discard_alignment": "0",
+        "inflight": "       0        0",
+        "partition": "1",
+        "ro": "0",
+        "size": "1048576",
+        "start": "2048",
+        "stat": "      86        0      712        7        0        0        0        0        0       72        0        0        0        0        0",
+        "subsystem": "block",
+        "uevent": "MAJOR=8\nMINOR=17\nDEVNAME=sdb1\nDEVTYPE=partition\nPARTN=1"
+      }
+    },
+    "/dev/sdb2": {
+      "DEVLINKS": "/dev/disk/by-id/wwn-0x0000000000000064-part2 /dev/disk/by-id/scsi-SQEMU_QEMU_HARDDISK_serial-a-part2 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_serial-a-part2 /dev/disk/by-partuuid/760493ac-7945-44c5-a6bd-58fcd6632ea7 /dev/disk/by-path/pci-0000:00:04.0-scsi-0:0:1:0-part2 /dev/disk/by-uuid/80ca57a0-60b7-4328-be41-afedf915effd /dev/disk/by-id/scsi-30000000000000064-part2",
+      "DEVNAME": "/dev/sdb2",
+      "DEVPATH": "/devices/pci0000:00/0000:00:04.0/virtio0/host2/target2:0:1/2:0:1:0/block/sdb/sdb2",
+      "DEVTYPE": "partition",
+      "DM_MULTIPATH_DEVICE_PATH": "1",
+      "ID_BUS": "scsi",
+      "ID_FS_TYPE": "ext4",
+      "ID_FS_USAGE": "filesystem",
+      "ID_FS_UUID": "80ca57a0-60b7-4328-be41-afedf915effd",
+      "ID_FS_UUID_ENC": "80ca57a0-60b7-4328-be41-afedf915effd",
+      "ID_FS_VERSION": "1.0",
+      "ID_MODEL": "QEMU_HARDDISK",
+      "ID_MODEL_ENC": "QEMU\\x20HARDDISK\\x20\\x20\\x20",
+      "ID_PART_ENTRY_DISK": "8:16",
+      "ID_PART_ENTRY_NUMBER": "2",
+      "ID_PART_ENTRY_OFFSET": "4096",
+      "ID_PART_ENTRY_SCHEME": "gpt",
+      "ID_PART_ENTRY_SIZE": "20965376",
+      "ID_PART_ENTRY_TYPE": "0fc63daf-8483-4772-8e79-3d69d8477de4",
+      "ID_PART_ENTRY_UUID": "760493ac-7945-44c5-a6bd-58fcd6632ea7",
+      "ID_PART_TABLE_TYPE": "gpt",
+      "ID_PART_TABLE_UUID": "8261cd75-2234-4dbd-920a-d21a7c083c94",
+      "ID_PATH": "pci-0000:00:04.0-scsi-0:0:1:0",
+      "ID_PATH_TAG": "pci-0000_00_04_0-scsi-0_0_1_0",
+      "ID_REVISION": "2.5+",
+      "ID_SCSI": "1",
+      "ID_SCSI_INQUIRY": "1",
+      "ID_SERIAL": "30000000000000064",
+      "ID_SERIAL_SHORT": "0000000000000064",
+      "ID_TYPE": "disk",
+      "ID_VENDOR": "QEMU",
+      "ID_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "ID_WWN": "0x0000000000000064",
+      "ID_WWN_WITH_EXTENSION": "0x0000000000000064",
+      "MAJOR": "8",
+      "MINOR": "18",
+      "PARTN": "2",
+      "SCSI_IDENT_LUN_NAA_LOCAL": "0000000000000064",
+      "SCSI_IDENT_LUN_VENDOR": "serial-a",
+      "SCSI_IDENT_SERIAL": "serial-a",
+      "SCSI_MODEL": "QEMU_HARDDISK",
+      "SCSI_MODEL_ENC": "QEMU\\x20HARDDISK\\x20\\x20\\x20",
+      "SCSI_REVISION": "2.5+",
+      "SCSI_TPGS": "0",
+      "SCSI_TYPE": "disk",
+      "SCSI_VENDOR": "QEMU",
+      "SCSI_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+      "SUBSYSTEM": "block",
+      "SYSTEMD_READY": "0",
+      "TAGS": ":systemd:",
+      "USEC_INITIALIZED": "1355435",
+      "attrs": {
+        "alignment_offset": "0",
+        "dev": "8:18",
+        "discard_alignment": "0",
+        "inflight": "       0        0",
+        "partition": "2",
+        "ro": "0",
+        "size": "10734272512",
+        "start": "4096",
+        "stat": "     129        0     8728       20        0        0        0        0        0       96        4        0        0        0        0",
+        "subsystem": "block",
+        "uevent": "MAJOR=8\nMINOR=18\nDEVNAME=sdb2\nDEVTYPE=partition\nPARTN=2"
+      }
+    },
+    "/dev/fd0": {
+      "DEVNAME": "/dev/fd0",
+      "DEVPATH": "/devices/platform/floppy.0/block/fd0",
+      "DEVTYPE": "disk",
+      "MAJOR": "2",
+      "MINOR": "0",
+      "SUBSYSTEM": "block",
+      "TAGS": ":systemd:",
+      "USEC_INITIALIZED": "1182861",
+      "attrs": {
+        "alignment_offset": "0",
+        "bdi": null,
+        "capability": "11",
+        "dev": "2:0",
+        "device": null,
+        "discard_alignment": "0",
+        "events": "",
+        "events_async": "",
+        "events_poll_msecs": "-1",
+        "ext_range": "1",
+        "hidden": "0",
+        "inflight": "       0        0",
+        "range": "1",
+        "removable": "1",
+        "ro": "0",
+        "size": "4096",
+        "stat": "       0        0        0        0        0        0        0        0        0        0        0        0        0        0        0",
+        "subsystem": "block",
+        "uevent": "MAJOR=2\nMINOR=0\nDEVNAME=fd0\nDEVTYPE=disk"
+      }
+    },
+    "/dev/dm-0": {
+      "DEVLINKS": "/dev/disk/by-id/wwn-0x0000000000000064 /dev/disk/by-id/dm-name-mpatha /dev/disk/by-id/dm-uuid-mpath-30000000000000064 /dev/mapper/mpatha",
+      "DEVNAME": "/dev/dm-0",
+      "DEVPATH": "/devices/virtual/block/dm-0",
+      "DEVTYPE": "disk",
+      "DM_NAME": "mpatha",
+      "DM_STATE": "ACTIVE",
+      "DM_SUSPENDED": "0",
+      "DM_TABLE_STATE": "LIVE",
+      "DM_TYPE": "scsi",
+      "DM_UDEV_DISABLE_LIBRARY_FALLBACK_FLAG": "1",
+      "DM_UDEV_PRIMARY_SOURCE_FLAG": "1",
+      "DM_UDEV_RULES": "1",
+      "DM_UDEV_RULES_VSN": "2",
+      "DM_UUID": "mpath-30000000000000064",
+      "DM_WWN": "0x0000000000000064",
+      "ID_PART_TABLE_TYPE": "gpt",
+      "ID_PART_TABLE_UUID": "8261cd75-2234-4dbd-920a-d21a7c083c94",
+      "MAJOR": "253",
+      "MINOR": "0",
+      "MPATH_DEVICE_READY": "1",
+      "MPATH_SBIN_PATH": "/sbin",
+      "SUBSYSTEM": "block",
+      "TAGS": ":systemd:",
+      "USEC_INITIALIZED": "9639027",
+      "attrs": {
+        "alignment_offset": "0",
+        "bdi": null,
+        "capability": "10",
+        "dev": "253:0",
+        "discard_alignment": "0",
+        "events": "",
+        "events_async": "",
+        "events_poll_msecs": "-1",
+        "ext_range": "1",
+        "hidden": "0",
+        "inflight": "       0        0",
+        "range": "1",
+        "removable": "0",
+        "ro": "0",
+        "size": "10737418240",
+        "stat": "     321        0    16720       46        0        0        0        0        0      172        0        0        0        0        0",
+        "subsystem": "block",
+        "uevent": "MAJOR=253\nMINOR=0\nDEVNAME=dm-0\nDEVTYPE=disk"
+      },
+      "partitiontable": {
+        "label": "gpt",
+        "id": "8261CD75-2234-4DBD-920A-D21A7C083C94",
+        "device": "/dev/dm-0",
+        "unit": "sectors",
+        "firstlba": 34,
+        "lastlba": 20971486,
+        "partitions": [
+          {
+            "node": "/dev/mapper/mpatha-part1",
+            "start": 2048,
+            "size": 2048,
+            "type": "21686148-6449-6E6F-744E-656564454649",
+            "uuid": "8088175C-362A-4B46-9603-F3595065FA73"
+          },
+          {
+            "node": "/dev/mapper/mpatha-part2",
+            "start": 4096,
+            "size": 20965376,
+            "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+            "uuid": "760493AC-7945-44C5-A6BD-58FCD6632EA7"
+          }
+        ]
+      }
+    },
+    "/dev/dm-1": {
+      "DEVLINKS": "/dev/disk/by-id/dm-name-mpatha-part1 /dev/mapper/mpatha-part1 /dev/disk/by-id/wwn-0x0000000000000064-part1 /dev/disk/by-partuuid/8088175c-362a-4b46-9603-f3595065fa73 /dev/disk/by-id/dm-uuid-part1-mpath-30000000000000064",
+      "DEVNAME": "/dev/dm-1",
+      "DEVPATH": "/devices/virtual/block/dm-1",
+      "DEVTYPE": "disk",
+      "DM_ACTIVATION": "1",
+      "DM_MPATH": "mpatha",
+      "DM_NAME": "mpatha-part1",
+      "DM_PART": "1",
+      "DM_STATE": "ACTIVE",
+      "DM_SUBSYSTEM_UDEV_FLAG0": "1",
+      "DM_SUSPENDED": "0",
+      "DM_TABLE_STATE": "LIVE",
+      "DM_TYPE": "scsi",
+      "DM_UDEV_DISABLE_LIBRARY_FALLBACK_FLAG": "1",
+      "DM_UDEV_PRIMARY_SOURCE_FLAG": "1",
+      "DM_UDEV_RULES": "1",
+      "DM_UDEV_RULES_VSN": "2",
+      "DM_UUID": "part1-mpath-30000000000000064",
+      "DM_WWN": "0x0000000000000064",
+      "ID_PART_ENTRY_DISK": "253:0",
+      "ID_PART_ENTRY_NUMBER": "1",
+      "ID_PART_ENTRY_OFFSET": "2048",
+      "ID_PART_ENTRY_SCHEME": "gpt",
+      "ID_PART_ENTRY_SIZE": "2048",
+      "ID_PART_ENTRY_TYPE": "21686148-6449-6e6f-744e-656564454649",
+      "ID_PART_ENTRY_UUID": "8088175c-362a-4b46-9603-f3595065fa73",
+      "MAJOR": "253",
+      "MINOR": "1",
+      "SUBSYSTEM": "block",
+      "TAGS": ":systemd:",
+      "USEC_INITIALIZED": "10556653",
+      "attrs": {
+        "alignment_offset": "0",
+        "bdi": null,
+        "capability": "10",
+        "dev": "253:1",
+        "discard_alignment": "0",
+        "events": "",
+        "events_async": "",
+        "events_poll_msecs": "-1",
+        "ext_range": "1",
+        "hidden": "0",
+        "inflight": "       0        0",
+        "range": "1",
+        "removable": "0",
+        "ro": "0",
+        "size": "1048576",
+        "stat": "      78        0      624        8        0        0        0        0        0       56        8        0        0        0        0",
+        "subsystem": "block",
+        "uevent": "MAJOR=253\nMINOR=1\nDEVNAME=dm-1\nDEVTYPE=disk"
+      }
+    },
+    "/dev/dm-2": {
+      "DEVLINKS": "/dev/mapper/mpatha-part2 /dev/disk/by-id/dm-uuid-part2-mpath-30000000000000064 /dev/disk/by-id/dm-name-mpatha-part2 /dev/disk/by-partuuid/760493ac-7945-44c5-a6bd-58fcd6632ea7 /dev/disk/by-uuid/80ca57a0-60b7-4328-be41-afedf915effd /dev/disk/by-id/wwn-0x0000000000000064-part2",
+      "DEVNAME": "/dev/dm-2",
+      "DEVPATH": "/devices/virtual/block/dm-2",
+      "DEVTYPE": "disk",
+      "DM_ACTIVATION": "1",
+      "DM_MPATH": "mpatha",
+      "DM_NAME": "mpatha-part2",
+      "DM_PART": "2",
+      "DM_STATE": "ACTIVE",
+      "DM_SUBSYSTEM_UDEV_FLAG0": "1",
+      "DM_SUSPENDED": "0",
+      "DM_TABLE_STATE": "LIVE",
+      "DM_TYPE": "scsi",
+      "DM_UDEV_DISABLE_LIBRARY_FALLBACK_FLAG": "1",
+      "DM_UDEV_PRIMARY_SOURCE_FLAG": "1",
+      "DM_UDEV_RULES": "1",
+      "DM_UDEV_RULES_VSN": "2",
+      "DM_UUID": "part2-mpath-30000000000000064",
+      "DM_WWN": "0x0000000000000064",
+      "ID_FS_TYPE": "ext4",
+      "ID_FS_USAGE": "filesystem",
+      "ID_FS_UUID": "80ca57a0-60b7-4328-be41-afedf915effd",
+      "ID_FS_UUID_ENC": "80ca57a0-60b7-4328-be41-afedf915effd",
+      "ID_FS_VERSION": "1.0",
+      "ID_PART_ENTRY_DISK": "253:0",
+      "ID_PART_ENTRY_NUMBER": "2",
+      "ID_PART_ENTRY_OFFSET": "4096",
+      "ID_PART_ENTRY_SCHEME": "gpt",
+      "ID_PART_ENTRY_SIZE": "20965376",
+      "ID_PART_ENTRY_TYPE": "0fc63daf-8483-4772-8e79-3d69d8477de4",
+      "ID_PART_ENTRY_UUID": "760493ac-7945-44c5-a6bd-58fcd6632ea7",
+      "MAJOR": "253",
+      "MINOR": "2",
+      "SUBSYSTEM": "block",
+      "TAGS": ":systemd:",
+      "USEC_INITIALIZED": "10583306",
+      "attrs": {
+        "alignment_offset": "0",
+        "bdi": null,
+        "capability": "10",
+        "dev": "253:2",
+        "discard_alignment": "0",
+        "events": "",
+        "events_async": "",
+        "events_poll_msecs": "-1",
+        "ext_range": "1",
+        "hidden": "0",
+        "inflight": "       0        0",
+        "range": "1",
+        "removable": "0",
+        "ro": "0",
+        "size": "10734272512",
+        "stat": "      91        0     8032        4        0        0        0        0        0       52        4        0        0        0        0",
+        "subsystem": "block",
+        "uevent": "MAJOR=253\nMINOR=2\nDEVNAME=dm-2\nDEVTYPE=disk"
+      }
+    }
+  },
+  "bcache": {
+    "backing": {},
+    "caching": {}
+  },
+  "zfs": {
+    "zpools": {}
+  }
+}
diff --git a/tests/data/probert_storage_raid1_partitions.json b/tests/data/probert_storage_raid1_partitions.json
new file mode 100644
index 0000000..709da5a
--- /dev/null
+++ b/tests/data/probert_storage_raid1_partitions.json
@@ -0,0 +1,951 @@
+{
+    "zfs": {
+        "zpools": {}
+    },
+    "dmcrypt": {},
+    "blockdev": {
+        "/dev/sr0": {
+            "DEVLINKS": "/dev/disk/by-label/Ubuntu-Server\\x2020.04\\x20LTS\\x20ppc64 /dev/disk/by-id/scsi-0QEMU_QEMU_CD-ROM_drive-scsi0-0-0-0 /dev/dvd /dev/cdrom /dev/disk/by-path/pci-0000:00:02.0-scsi-0:0:0:0 /dev/disk/by-uuid/2019-11-16-08-09-20-00",
+            "DEVNAME": "/dev/sr0",
+            "DEVPATH": "/devices/pci0000:00/0000:00:02.0/virtio1/host0/target0:0:0/0:0:0:0/block/sr0",
+            "DEVTYPE": "disk",
+            "ID_BUS": "scsi",
+            "ID_CDROM": "1",
+            "ID_CDROM_CD": "1",
+            "ID_CDROM_DVD": "1",
+            "ID_CDROM_MEDIA": "1",
+            "ID_CDROM_MEDIA_DVD": "1",
+            "ID_CDROM_MEDIA_SESSION_COUNT": "1",
+            "ID_CDROM_MEDIA_STATE": "complete",
+            "ID_CDROM_MEDIA_TRACK_COUNT": "1",
+            "ID_CDROM_MEDIA_TRACK_COUNT_DATA": "1",
+            "ID_CDROM_MRW": "1",
+            "ID_CDROM_MRW_W": "1",
+            "ID_FOR_SEAT": "block-pci-0000_00_02_0-scsi-0_0_0_0",
+            "ID_FS_APPLICATION_ID": "GENISOIMAGE\\x20ISO\\x209660\\x2fHFS\\x20FILESYSTEM\\x20CREATOR\\x20\\x28C\\x29\\x201993\\x20E.YOUNGDALE\\x20\\x28C\\x29\\x201997-2006\\x20J.PEARSON\\x2fJ.SCHILLING\\x20\\x28C\\x29\\x202006-2007\\x20CDRKIT\\x20TEAM",
+            "ID_FS_LABEL": "Ubuntu-Server_20.04_LTS_ppc64",
+            "ID_FS_LABEL_ENC": "Ubuntu-Server\\x2020.04\\x20LTS\\x20ppc64",
+            "ID_FS_SYSTEM_ID": "LINUX",
+            "ID_FS_TYPE": "iso9660",
+            "ID_FS_USAGE": "filesystem",
+            "ID_FS_UUID": "2019-11-16-08-09-20-00",
+            "ID_FS_UUID_ENC": "2019-11-16-08-09-20-00",
+            "ID_MODEL": "QEMU_CD-ROM",
+            "ID_MODEL_ENC": "QEMU\\x20CD-ROM\\x20\\x20\\x20\\x20\\x20",
+            "ID_PART_TABLE_TYPE": "mac",
+            "ID_PATH": "pci-0000:00:02.0-scsi-0:0:0:0",
+            "ID_PATH_TAG": "pci-0000_00_02_0-scsi-0_0_0_0",
+            "ID_REVISION": "2.5+",
+            "ID_SCSI": "1",
+            "ID_SCSI_INQUIRY": "1",
+            "ID_SERIAL": "0QEMU_QEMU_CD-ROM_drive-scsi0-0-0-0",
+            "ID_SERIAL_SHORT": "drive-scsi0-0-0-0",
+            "ID_TYPE": "cd",
+            "ID_VENDOR": "QEMU",
+            "ID_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+            "MAJOR": "11",
+            "MINOR": "0",
+            "SCSI_MODEL": "QEMU_CD-ROM",
+            "SCSI_MODEL_ENC": "QEMU\\x20CD-ROM\\x20\\x20\\x20\\x20\\x20",
+            "SCSI_REVISION": "2.5+",
+            "SCSI_TPGS": "0",
+            "SCSI_TYPE": "cd/dvd",
+            "SCSI_VENDOR": "QEMU",
+            "SCSI_VENDOR_ENC": "QEMU\\x20\\x20\\x20\\x20",
+            "SUBSYSTEM": "block",
+            "SYSTEMD_MOUNT_DEVICE_BOUND": "1",
+            "TAGS": ":uaccess:seat:systemd:",
+            "USEC_INITIALIZED": "626053",
+            "attrs": {
+                "alignment_offset": "0",
+                "bdi": null,
+                "capability": "119",
+                "dev": "11:0",
+                "device": null,
+                "discard_alignment": "0",
+                "events": "media_change eject_request",
+                "events_async": "",
+                "events_poll_msecs": "-1",
+                "ext_range": "1",
+                "hidden": "0",
+                "inflight": "       0        0",
+                "range": "1",
+                "removable": "1",
+                "ro": "0",
+                "size": "911030272",
+                "stat": "    6887        0  1582024      636        0        0        0        0        0    17552       64        0        0        0        0",
+                "subsystem": "block",
+                "uevent": "MAJOR=11\nMINOR=0\nDEVNAME=sr0\nDEVTYPE=disk"
+            },
+            "partitiontable": {
+                "label": "dos",
+                "id": "0x64040020",
+                "device": "/dev/sr0",
+                "unit": "sectors",
+                "partitions": [
+                    {
+                        "node": "/dev/sr0p1",
+                        "start": 0,
+                        "size": 1778756,
+                        "type": "96",
+                        "bootable": true
+                    },
+                    {
+                        "node": "/dev/sr0p2",
+                        "start": 2129919,
+                        "size": 1936615684,
+                        "type": "ff"
+                    },
+                    {
+                        "node": "/dev/sr0p3",
+                        "start": 1024,
+                        "size": 0,
+                        "type": "0"
+                    },
+                    {
+                        "node": "/dev/sr0p4",
+                        "start": 0,
+                        "size": 0,
+                        "type": "0"
+                    }
+                ]
+            }
+        },
+        "/dev/vda": {
+            "DEVLINKS": "/dev/disk/by-path/pci-0000:00:04.0 /dev/disk/by-path/virtio-pci-0000:00:04.0",
+            "DEVNAME": "/dev/vda",
+            "DEVPATH": "/devices/pci0000:00/0000:00:04.0/virtio2/block/vda",
+            "DEVTYPE": "disk",
+            "ID_PART_TABLE_TYPE": "gpt",
+            "ID_PART_TABLE_UUID": "c43bafba-6f3f-4ac7-8c3a-3808451ad55e",
+            "ID_PATH": "pci-0000:00:04.0",
+            "ID_PATH_TAG": "pci-0000_00_04_0",
+            "MAJOR": "252",
+            "MINOR": "0",
+            "SUBSYSTEM": "block",
+            "TAGS": ":systemd:",
+            "USEC_INITIALIZED": "592200",
+            "attrs": {
+                "alignment_offset": "0",
+                "bdi": null,
+                "cache_type": "write back",
+                "capability": "50",
+                "dev": "252:0",
+                "device": null,
+                "discard_alignment": "0",
+                "events": "",
+                "events_async": "",
+                "events_poll_msecs": "-1",
+                "ext_range": "256",
+                "hidden": "0",
+                "inflight": "       0        0",
+                "range": "16",
+                "removable": "0",
+                "ro": "0",
+                "serial": "",
+                "size": "6442450944",
+                "stat": "    2923        0   473854      187     1654     3072   402696      427        0     3300       12        0        0        0        0",
+                "subsystem": "block",
+                "uevent": "MAJOR=252\nMINOR=0\nDEVNAME=vda\nDEVTYPE=disk"
+            },
+            "partitiontable": {
+                "label": "gpt",
+                "id": "C43BAFBA-6F3F-4AC7-8C3A-3808451AD55E",
+                "device": "/dev/vda",
+                "unit": "sectors",
+                "firstlba": 34,
+                "lastlba": 12582878,
+                "partitions": [
+                    {
+                        "node": "/dev/vda1",
+                        "start": 2048,
+                        "size": 16384,
+                        "type": "9E1A2D38-C612-4316-AA26-8B49521E5A8B",
+                        "uuid": "CFECC68C-325E-4066-8F6F-0FE4F57D1AF5"
+                    },
+                    {
+                        "node": "/dev/vda2",
+                        "start": 18432,
+                        "size": 2097152,
+                        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                        "uuid": "D29ADB04-DF89-4D54-9B50-8DB8EEDAB339"
+                    }
+                ]
+            }
+        },
+        "/dev/vda1": {
+            "DEVLINKS": "/dev/disk/by-path/pci-0000:00:04.0-part1 /dev/disk/by-partuuid/cfecc68c-325e-4066-8f6f-0fe4f57d1af5 /dev/disk/by-path/virtio-pci-0000:00:04.0-part1",
+            "DEVNAME": "/dev/vda1",
+            "DEVPATH": "/devices/pci0000:00/0000:00:04.0/virtio2/block/vda/vda1",
+            "DEVTYPE": "partition",
+            "ID_PART_ENTRY_DISK": "252:0",
+            "ID_PART_ENTRY_NUMBER": "1",
+            "ID_PART_ENTRY_OFFSET": "2048",
+            "ID_PART_ENTRY_SCHEME": "gpt",
+            "ID_PART_ENTRY_SIZE": "16384",
+            "ID_PART_ENTRY_TYPE": "9e1a2d38-c612-4316-aa26-8b49521e5a8b",
+            "ID_PART_ENTRY_UUID": "cfecc68c-325e-4066-8f6f-0fe4f57d1af5",
+            "ID_PART_TABLE_TYPE": "gpt",
+            "ID_PART_TABLE_UUID": "c43bafba-6f3f-4ac7-8c3a-3808451ad55e",
+            "ID_PATH": "pci-0000:00:04.0",
+            "ID_PATH_TAG": "pci-0000_00_04_0",
+            "ID_SCSI": "1",
+            "MAJOR": "252",
+            "MINOR": "1",
+            "PARTN": "1",
+            "SUBSYSTEM": "block",
+            "TAGS": ":systemd:",
+            "USEC_INITIALIZED": "62680508",
+            "attrs": {
+                "alignment_offset": "0",
+                "dev": "252:1",
+                "discard_alignment": "0",
+                "inflight": "       0        0",
+                "partition": "1",
+                "ro": "0",
+                "size": "8388608",
+                "start": "2048",
+                "stat": "     449        0    74496       31        6        3     1152        0        0      620        0        0        0        0        0",
+                "subsystem": "block",
+                "uevent": "MAJOR=252\nMINOR=1\nDEVNAME=vda1\nDEVTYPE=partition\nPARTN=1"
+            }
+        },
+        "/dev/vda2": {
+            "DEVLINKS": "/dev/disk/by-partuuid/d29adb04-df89-4d54-9b50-8db8eedab339 /dev/disk/by-uuid/0a3b5403-d358-4f30-9094-e5a19d60b222 /dev/disk/by-path/pci-0000:00:04.0-part2 /dev/disk/by-path/virtio-pci-0000:00:04.0-part2",
+            "DEVNAME": "/dev/vda2",
+            "DEVPATH": "/devices/pci0000:00/0000:00:04.0/virtio2/block/vda/vda2",
+            "DEVTYPE": "partition",
+            "ID_FS_TYPE": "ext4",
+            "ID_FS_USAGE": "filesystem",
+            "ID_FS_UUID": "0a3b5403-d358-4f30-9094-e5a19d60b222",
+            "ID_FS_UUID_ENC": "0a3b5403-d358-4f30-9094-e5a19d60b222",
+            "ID_FS_VERSION": "1.0",
+            "ID_PART_ENTRY_DISK": "252:0",
+            "ID_PART_ENTRY_NUMBER": "2",
+            "ID_PART_ENTRY_OFFSET": "18432",
+            "ID_PART_ENTRY_SCHEME": "gpt",
+            "ID_PART_ENTRY_SIZE": "2097152",
+            "ID_PART_ENTRY_TYPE": "0fc63daf-8483-4772-8e79-3d69d8477de4",
+            "ID_PART_ENTRY_UUID": "d29adb04-df89-4d54-9b50-8db8eedab339",
+            "ID_PART_TABLE_TYPE": "gpt",
+            "ID_PART_TABLE_UUID": "c43bafba-6f3f-4ac7-8c3a-3808451ad55e",
+            "ID_PATH": "pci-0000:00:04.0",
+            "ID_PATH_TAG": "pci-0000_00_04_0",
+            "ID_SCSI": "1",
+            "MAJOR": "252",
+            "MINOR": "2",
+            "PARTN": "2",
+            "SUBSYSTEM": "block",
+            "TAGS": ":systemd:",
+            "USEC_INITIALIZED": "62650105",
+            "attrs": {
+                "alignment_offset": "0",
+                "dev": "252:2",
+                "discard_alignment": "0",
+                "inflight": "       0        0",
+                "partition": "2",
+                "ro": "0",
+                "size": "1073741824",
+                "start": "18432",
+                "stat": "     322        0    50394       22     1522     2894   310648      343        0      756       12        0        0        0        0",
+                "subsystem": "block",
+                "uevent": "MAJOR=252\nMINOR=2\nDEVNAME=vda2\nDEVTYPE=partition\nPARTN=2"
+            }
+        },
+        "/dev/vdb": {
+            "DEVLINKS": "/dev/disk/by-path/virtio-pci-0000:00:05.0 /dev/disk/by-path/pci-0000:00:05.0",
+            "DEVNAME": "/dev/vdb",
+            "DEVPATH": "/devices/pci0000:00/0000:00:05.0/virtio3/block/vdb",
+            "DEVTYPE": "disk",
+            "ID_PART_TABLE_TYPE": "gpt",
+            "ID_PART_TABLE_UUID": "0c49cc0b-d527-4a88-a61a-4684bcdf8a5e",
+            "ID_PATH": "pci-0000:00:05.0",
+            "ID_PATH_TAG": "pci-0000_00_05_0",
+            "MAJOR": "252",
+            "MINOR": "16",
+            "SUBSYSTEM": "block",
+            "TAGS": ":systemd:",
+            "USEC_INITIALIZED": "600195",
+            "attrs": {
+                "alignment_offset": "0",
+                "bdi": null,
+                "cache_type": "write back",
+                "capability": "50",
+                "dev": "252:16",
+                "device": null,
+                "discard_alignment": "0",
+                "events": "",
+                "events_async": "",
+                "events_poll_msecs": "-1",
+                "ext_range": "256",
+                "hidden": "0",
+                "inflight": "       0        0",
+                "range": "16",
+                "removable": "0",
+                "ro": "0",
+                "serial": "",
+                "size": "6442450944",
+                "stat": "   20457    64216 10072248     3184    39416    65487  5219881    24281        0    27324     8488        0        0        0        0",
+                "subsystem": "block",
+                "uevent": "MAJOR=252\nMINOR=16\nDEVNAME=vdb\nDEVTYPE=disk"
+            },
+            "partitiontable": {
+                "label": "gpt",
+                "id": "0C49CC0B-D527-4A88-A61A-4684BCDF8A5E",
+                "device": "/dev/vdb",
+                "unit": "sectors",
+                "firstlba": 34,
+                "lastlba": 12582878,
+                "partitions": [
+                    {
+                        "node": "/dev/vdb1",
+                        "start": 2048,
+                        "size": 8388608,
+                        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                        "uuid": "408078B3-15C1-4315-A376-C2F1E3F13A63"
+                    }
+                ]
+            }
+        },
+        "/dev/vdb1": {
+            "DEVLINKS": "/dev/disk/by-partuuid/408078b3-15c1-4315-a376-c2f1e3f13a63 /dev/disk/by-path/virtio-pci-0000:00:05.0-part1 /dev/disk/by-path/pci-0000:00:05.0-part1",
+            "DEVNAME": "/dev/vdb1",
+            "DEVPATH": "/devices/pci0000:00/0000:00:05.0/virtio3/block/vdb/vdb1",
+            "DEVTYPE": "partition",
+            "ID_FS_LABEL": "ubuntu-server:1",
+            "ID_FS_LABEL_ENC": "ubuntu-server:1",
+            "ID_FS_TYPE": "linux_raid_member",
+            "ID_FS_USAGE": "raid",
+            "ID_FS_UUID": "1e4e3ac4-abd1-ee76-6fdb-871a4d6677af",
+            "ID_FS_UUID_ENC": "1e4e3ac4-abd1-ee76-6fdb-871a4d6677af",
+            "ID_FS_UUID_SUB": "f1366f7f-319f-81e6-7550-edb94d240727",
+            "ID_FS_UUID_SUB_ENC": "f1366f7f-319f-81e6-7550-edb94d240727",
+            "ID_FS_VERSION": "1.2",
+            "ID_PART_ENTRY_DISK": "252:16",
+            "ID_PART_ENTRY_NUMBER": "1",
+            "ID_PART_ENTRY_OFFSET": "2048",
+            "ID_PART_ENTRY_SCHEME": "gpt",
+            "ID_PART_ENTRY_SIZE": "8388608",
+            "ID_PART_ENTRY_TYPE": "0fc63daf-8483-4772-8e79-3d69d8477de4",
+            "ID_PART_ENTRY_UUID": "408078b3-15c1-4315-a376-c2f1e3f13a63",
+            "ID_PART_TABLE_TYPE": "gpt",
+            "ID_PART_TABLE_UUID": "0c49cc0b-d527-4a88-a61a-4684bcdf8a5e",
+            "ID_PATH": "pci-0000:00:05.0",
+            "ID_PATH_TAG": "pci-0000_00_05_0",
+            "ID_SCSI": "1",
+            "MAJOR": "252",
+            "MINOR": "17",
+            "PARTN": "1",
+            "SUBSYSTEM": "block",
+            "TAGS": ":systemd:",
+            "USEC_INITIALIZED": "52064605",
+            "attrs": {
+                "alignment_offset": "0",
+                "dev": "252:17",
+                "discard_alignment": "0",
+                "inflight": "       0        0",
+                "partition": "1",
+                "ro": "0",
+                "size": "4294967296",
+                "start": "2048",
+                "stat": "   19443    64216  9896724     3125    39280    65397  5207337    24270        0    26204     8488        0        0        0        0",
+                "subsystem": "block",
+                "uevent": "MAJOR=252\nMINOR=17\nDEVNAME=vdb1\nDEVTYPE=partition\nPARTN=1"
+            }
+        },
+        "/dev/vdc": {
+            "DEVLINKS": "/dev/disk/by-path/pci-0000:00:06.0 /dev/disk/by-path/virtio-pci-0000:00:06.0",
+            "DEVNAME": "/dev/vdc",
+            "DEVPATH": "/devices/pci0000:00/0000:00:06.0/virtio4/block/vdc",
+            "DEVTYPE": "disk",
+            "ID_PART_TABLE_TYPE": "gpt",
+            "ID_PART_TABLE_UUID": "c805b10b-ded9-4519-947c-bcad1d6e81ed",
+            "ID_PATH": "pci-0000:00:06.0",
+            "ID_PATH_TAG": "pci-0000_00_06_0",
+            "MAJOR": "252",
+            "MINOR": "32",
+            "SUBSYSTEM": "block",
+            "TAGS": ":systemd:",
+            "USEC_INITIALIZED": "600459",
+            "attrs": {
+                "alignment_offset": "0",
+                "bdi": null,
+                "cache_type": "write back",
+                "capability": "50",
+                "dev": "252:32",
+                "device": null,
+                "discard_alignment": "0",
+                "events": "",
+                "events_async": "",
+                "events_poll_msecs": "-1",
+                "ext_range": "256",
+                "hidden": "0",
+                "inflight": "       0        0",
+                "range": "16",
+                "removable": "0",
+                "ro": "0",
+                "serial": "",
+                "size": "6442450944",
+                "stat": "    2791      749   264502      172    43737   126620 13598249    40301        0    19796    23016        0        0        0        0",
+                "subsystem": "block",
+                "uevent": "MAJOR=252\nMINOR=32\nDEVNAME=vdc\nDEVTYPE=disk"
+            },
+            "partitiontable": {
+                "label": "gpt",
+                "id": "C805B10B-DED9-4519-947C-BCAD1D6E81ED",
+                "device": "/dev/vdc",
+                "unit": "sectors",
+                "firstlba": 34,
+                "lastlba": 12582878,
+                "partitions": [
+                    {
+                        "node": "/dev/vdc1",
+                        "start": 2048,
+                        "size": 8388608,
+                        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                        "uuid": "69441F30-8321-4A70-A4CF-6A4B92393CD6"
+                    }
+                ]
+            }
+        },
+        "/dev/vdc1": {
+            "DEVLINKS": "/dev/disk/by-partuuid/69441f30-8321-4a70-a4cf-6a4b92393cd6 /dev/disk/by-path/pci-0000:00:06.0-part1 /dev/disk/by-path/virtio-pci-0000:00:06.0-part1",
+            "DEVNAME": "/dev/vdc1",
+            "DEVPATH": "/devices/pci0000:00/0000:00:06.0/virtio4/block/vdc/vdc1",
+            "DEVTYPE": "partition",
+            "ID_FS_LABEL": "ubuntu-server:1",
+            "ID_FS_LABEL_ENC": "ubuntu-server:1",
+            "ID_FS_TYPE": "linux_raid_member",
+            "ID_FS_USAGE": "raid",
+            "ID_FS_UUID": "1e4e3ac4-abd1-ee76-6fdb-871a4d6677af",
+            "ID_FS_UUID_ENC": "1e4e3ac4-abd1-ee76-6fdb-871a4d6677af",
+            "ID_FS_UUID_SUB": "52929a1d-d9f0-e3a9-c16e-c40433201114",
+            "ID_FS_UUID_SUB_ENC": "52929a1d-d9f0-e3a9-c16e-c40433201114",
+            "ID_FS_VERSION": "1.2",
+            "ID_PART_ENTRY_DISK": "252:32",
+            "ID_PART_ENTRY_NUMBER": "1",
+            "ID_PART_ENTRY_OFFSET": "2048",
+            "ID_PART_ENTRY_SCHEME": "gpt",
+            "ID_PART_ENTRY_SIZE": "8388608",
+            "ID_PART_ENTRY_TYPE": "0fc63daf-8483-4772-8e79-3d69d8477de4",
+            "ID_PART_ENTRY_UUID": "69441f30-8321-4a70-a4cf-6a4b92393cd6",
+            "ID_PART_TABLE_TYPE": "gpt",
+            "ID_PART_TABLE_UUID": "c805b10b-ded9-4519-947c-bcad1d6e81ed",
+            "ID_PATH": "pci-0000:00:06.0",
+            "ID_PATH_TAG": "pci-0000_00_06_0",
+            "ID_SCSI": "1",
+            "MAJOR": "252",
+            "MINOR": "33",
+            "PARTN": "1",
+            "SUBSYSTEM": "block",
+            "TAGS": ":systemd:",
+            "USEC_INITIALIZED": "52548543",
+            "attrs": {
+                "alignment_offset": "0",
+                "dev": "252:33",
+                "discard_alignment": "0",
+                "inflight": "       0        0",
+                "partition": "1",
+                "ro": "0",
+                "size": "4294967296",
+                "start": "2048",
+                "stat": "    1756      749    86802      112    43601   126530 13585705    40291        0    18404    23016        0        0        0        0",
+                "subsystem": "block",
+                "uevent": "MAJOR=252\nMINOR=33\nDEVNAME=vdc1\nDEVTYPE=partition\nPARTN=1"
+            }
+        },
+        "/dev/vdd": {
+            "DEVLINKS": "/dev/disk/by-path/virtio-pci-0000:00:07.0 /dev/disk/by-uuid/00c629d6-06ab-4dfd-b21e-c3186f34105d /dev/disk/by-path/pci-0000:00:07.0",
+            "DEVNAME": "/dev/vdd",
+            "DEVPATH": "/devices/pci0000:00/0000:00:07.0/virtio5/block/vdd",
+            "DEVTYPE": "disk",
+            "ID_FS_TYPE": "ext2",
+            "ID_FS_USAGE": "filesystem",
+            "ID_FS_UUID": "00c629d6-06ab-4dfd-b21e-c3186f34105d",
+            "ID_FS_UUID_ENC": "00c629d6-06ab-4dfd-b21e-c3186f34105d",
+            "ID_FS_VERSION": "1.0",
+            "ID_PATH": "pci-0000:00:07.0",
+            "ID_PATH_TAG": "pci-0000_00_07_0",
+            "MAJOR": "252",
+            "MINOR": "48",
+            "SUBSYSTEM": "block",
+            "TAGS": ":systemd:",
+            "USEC_INITIALIZED": "563993",
+            "attrs": {
+                "alignment_offset": "0",
+                "bdi": null,
+                "cache_type": "write back",
+                "capability": "50",
+                "dev": "252:48",
+                "device": null,
+                "discard_alignment": "0",
+                "events": "",
+                "events_async": "",
+                "events_poll_msecs": "-1",
+                "ext_range": "256",
+                "hidden": "0",
+                "inflight": "       0        0",
+                "range": "16",
+                "removable": "0",
+                "ro": "1",
+                "serial": "",
+                "size": "1048576",
+                "stat": "      97        0     3367        4        2        0        0        0        0       76        0        0        0        0        0",
+                "subsystem": "block",
+                "uevent": "MAJOR=252\nMINOR=48\nDEVNAME=vdd\nDEVTYPE=disk"
+            }
+        },
+        "/dev/md1": {
+            "DEVLINKS": "/dev/disk/by-id/md-name-ubuntu-server:1 /dev/disk/by-id/md-uuid-1e4e3ac4:abd1ee76:6fdb871a:4d6677af",
+            "DEVNAME": "/dev/md1",
+            "DEVPATH": "/devices/virtual/block/md1",
+            "DEVTYPE": "disk",
+            "ID_PART_TABLE_TYPE": "gpt",
+            "ID_PART_TABLE_UUID": "18f354ee-3557-4a37-9508-c947edb21b5c",
+            "MAJOR": "9",
+            "MD_DEVICES": "2",
+            "MD_DEVICE_ev_vdb1_DEV": "/dev/vdb1",
+            "MD_DEVICE_ev_vdb1_ROLE": "0",
+            "MD_DEVICE_ev_vdc1_DEV": "/dev/vdc1",
+            "MD_DEVICE_ev_vdc1_ROLE": "1",
+            "MD_LEVEL": "raid1",
+            "MD_METADATA": "1.2",
+            "MD_NAME": "ubuntu-server:1",
+            "MD_UUID": "1e4e3ac4:abd1ee76:6fdb871a:4d6677af",
+            "MINOR": "1",
+            "SUBSYSTEM": "block",
+            "SYSTEMD_WANTS": "mdmonitor.service",
+            "TAGS": ":systemd:",
+            "USEC_INITIALIZED": "52972570",
+            "attrs": {
+                "alignment_offset": "0",
+                "bdi": null,
+                "capability": "50",
+                "dev": "9:1",
+                "discard_alignment": "0",
+                "events": "",
+                "events_async": "",
+                "events_poll_msecs": "-1",
+                "ext_range": "256",
+                "hidden": "0",
+                "inflight": "       0        0",
+                "range": "1",
+                "removable": "0",
+                "ro": "0",
+                "size": "4289724416",
+                "stat": "   20095        0  1539578        0   105192        0  5220984        0        0        0        0        0        0        0        0",
+                "subsystem": "block",
+                "uevent": "MAJOR=9\nMINOR=1\nDEVNAME=md1\nDEVTYPE=disk"
+            },
+            "partitiontable": {
+                "label": "gpt",
+                "id": "18F354EE-3557-4A37-9508-C947EDB21B5C",
+                "device": "/dev/md1",
+                "unit": "sectors",
+                "firstlba": 34,
+                "lastlba": 8378334,
+                "partitions": [
+                    {
+                        "node": "/dev/md1p1",
+                        "start": 2048,
+                        "size": 8370176,
+                        "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+                        "uuid": "5B3F90C0-2432-45C1-98E2-6E9E6649430E"
+                    }
+                ]
+            }
+        },
+        "/dev/md1p1": {
+            "DEVLINKS": "/dev/disk/by-uuid/b312e605-d330-43ad-aa9b-2d503412977d /dev/disk/by-id/md-uuid-1e4e3ac4:abd1ee76:6fdb871a:4d6677af-part1 /dev/disk/by-id/md-name-ubuntu-server:1-part1",
+            "DEVNAME": "/dev/md1p1",
+            "DEVPATH": "/devices/virtual/block/md1/md1p1",
+            "DEVTYPE": "partition",
+            "ID_FS_TYPE": "ext4",
+            "ID_FS_USAGE": "filesystem",
+            "ID_FS_UUID": "b312e605-d330-43ad-aa9b-2d503412977d",
+            "ID_FS_UUID_ENC": "b312e605-d330-43ad-aa9b-2d503412977d",
+            "ID_FS_VERSION": "1.0",
+            "ID_PART_ENTRY_DISK": "9:1",
+            "ID_PART_ENTRY_NUMBER": "1",
+            "ID_PART_ENTRY_OFFSET": "2048",
+            "ID_PART_ENTRY_SCHEME": "gpt",
+            "ID_PART_ENTRY_SIZE": "8370176",
+            "ID_PART_ENTRY_TYPE": "0fc63daf-8483-4772-8e79-3d69d8477de4",
+            "ID_PART_ENTRY_UUID": "5b3f90c0-2432-45c1-98e2-6e9e6649430e",
+            "ID_SCSI": "1",
+            "MAJOR": "259",
+            "MD_DEVICES": "2",
+            "MD_DEVICE_ev_vdb1_DEV": "/dev/vdb1",
+            "MD_DEVICE_ev_vdb1_ROLE": "0",
+            "MD_DEVICE_ev_vdc1_DEV": "/dev/vdc1",
+            "MD_DEVICE_ev_vdc1_ROLE": "1",
+            "MD_LEVEL": "raid1",
+            "MD_METADATA": "1.2",
+            "MD_NAME": "ubuntu-server:1",
+            "MD_UUID": "1e4e3ac4:abd1ee76:6fdb871a:4d6677af",
+            "MINOR": "1",
+            "PARTN": "1",
+            "SUBSYSTEM": "block",
+            "SYSTEMD_WANTS": "mdmonitor.service",
+            "TAGS": ":systemd:",
+            "USEC_INITIALIZED": "62053949",
+            "attrs": {
+                "alignment_offset": "0",
+                "dev": "259:1",
+                "discard_alignment": "0",
+                "inflight": "       0        0",
+                "partition": "1",
+                "ro": "0",
+                "size": "4285530112",
+                "start": "2048",
+                "stat": "       0        0        0        0        0        0        0        0        0        0        0        0        0        0        0",
+                "subsystem": "block",
+                "uevent": "MAJOR=259\nMINOR=1\nDEVNAME=md1p1\nDEVTYPE=partition\nPARTN=1"
+            }
+        }
+    },
+    "bcache": {
+        "backing": {},
+        "caching": {}
+    },
+    "lvm": {},
+    "mount": [
+        {
+            "target": "/",
+            "source": "/cow",
+            "fstype": "overlay",
+            "options": "rw,relatime,lowerdir=/installer.squashfs:/filesystem.squashfs,upperdir=/cow/upper,workdir=/cow/work",
+            "children": [
+                {
+                    "target": "/sys",
+                    "source": "sysfs",
+                    "fstype": "sysfs",
+                    "options": "rw,nosuid,nodev,noexec,relatime",
+                    "children": [
+                        {
+                            "target": "/sys/kernel/security",
+                            "source": "securityfs",
+                            "fstype": "securityfs",
+                            "options": "rw,nosuid,nodev,noexec,relatime"
+                        },
+                        {
+                            "target": "/sys/fs/cgroup",
+                            "source": "tmpfs",
+                            "fstype": "tmpfs",
+                            "options": "ro,nosuid,nodev,noexec,mode=755",
+                            "children": [
+                                {
+                                    "target": "/sys/fs/cgroup/unified",
+                                    "source": "cgroup2",
+                                    "fstype": "cgroup2",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,nsdelegate"
+                                },
+                                {
+                                    "target": "/sys/fs/cgroup/systemd",
+                                    "source": "cgroup",
+                                    "fstype": "cgroup",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,xattr,name=systemd"
+                                },
+                                {
+                                    "target": "/sys/fs/cgroup/freezer",
+                                    "source": "cgroup",
+                                    "fstype": "cgroup",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,freezer"
+                                },
+                                {
+                                    "target": "/sys/fs/cgroup/pids",
+                                    "source": "cgroup",
+                                    "fstype": "cgroup",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,pids"
+                                },
+                                {
+                                    "target": "/sys/fs/cgroup/cpuset",
+                                    "source": "cgroup",
+                                    "fstype": "cgroup",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,cpuset"
+                                },
+                                {
+                                    "target": "/sys/fs/cgroup/cpu,cpuacct",
+                                    "source": "cgroup",
+                                    "fstype": "cgroup",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,cpu,cpuacct"
+                                },
+                                {
+                                    "target": "/sys/fs/cgroup/blkio",
+                                    "source": "cgroup",
+                                    "fstype": "cgroup",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,blkio"
+                                },
+                                {
+                                    "target": "/sys/fs/cgroup/net_cls,net_prio",
+                                    "source": "cgroup",
+                                    "fstype": "cgroup",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,net_cls,net_prio"
+                                },
+                                {
+                                    "target": "/sys/fs/cgroup/rdma",
+                                    "source": "cgroup",
+                                    "fstype": "cgroup",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,rdma"
+                                },
+                                {
+                                    "target": "/sys/fs/cgroup/devices",
+                                    "source": "cgroup",
+                                    "fstype": "cgroup",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,devices"
+                                },
+                                {
+                                    "target": "/sys/fs/cgroup/memory",
+                                    "source": "cgroup",
+                                    "fstype": "cgroup",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,memory"
+                                },
+                                {
+                                    "target": "/sys/fs/cgroup/perf_event",
+                                    "source": "cgroup",
+                                    "fstype": "cgroup",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,perf_event"
+                                },
+                                {
+                                    "target": "/sys/fs/cgroup/hugetlb",
+                                    "source": "cgroup",
+                                    "fstype": "cgroup",
+                                    "options": "rw,nosuid,nodev,noexec,relatime,hugetlb"
+                                }
+                            ]
+                        },
+                        {
+                            "target": "/sys/fs/pstore",
+                            "source": "pstore",
+                            "fstype": "pstore",
+                            "options": "rw,nosuid,nodev,noexec,relatime"
+                        },
+                        {
+                            "target": "/sys/fs/bpf",
+                            "source": "bpf",
+                            "fstype": "bpf",
+                            "options": "rw,nosuid,nodev,noexec,relatime,mode=700"
+                        },
+                        {
+                            "target": "/sys/kernel/debug",
+                            "source": "debugfs",
+                            "fstype": "debugfs",
+                            "options": "rw,nosuid,nodev,noexec,relatime"
+                        },
+                        {
+                            "target": "/sys/fs/fuse/connections",
+                            "source": "fusectl",
+                            "fstype": "fusectl",
+                            "options": "rw,nosuid,nodev,noexec,relatime"
+                        },
+                        {
+                            "target": "/sys/kernel/config",
+                            "source": "configfs",
+                            "fstype": "configfs",
+                            "options": "rw,nosuid,nodev,noexec,relatime"
+                        }
+                    ]
+                },
+                {
+                    "target": "/proc",
+                    "source": "proc",
+                    "fstype": "proc",
+                    "options": "rw,nosuid,nodev,noexec,relatime",
+                    "children": [
+                        {
+                            "target": "/proc/sys/fs/binfmt_misc",
+                            "source": "systemd-1",
+                            "fstype": "autofs",
+                            "options": "rw,relatime,fd=27,pgrp=1,timeout=0,minproto=5,maxproto=5,direct,pipe_ino=13520"
+                        }
+                    ]
+                },
+                {
+                    "target": "/dev",
+                    "source": "udev",
+                    "fstype": "devtmpfs",
+                    "options": "rw,nosuid,relatime,size=956672k,nr_inodes=14948,mode=755",
+                    "children": [
+                        {
+                            "target": "/dev/pts",
+                            "source": "devpts",
+                            "fstype": "devpts",
+                            "options": "rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000"
+                        },
+                        {
+                            "target": "/dev/shm",
+                            "source": "tmpfs",
+                            "fstype": "tmpfs",
+                            "options": "rw,nosuid,nodev"
+                        },
+                        {
+                            "target": "/dev/mqueue",
+                            "source": "mqueue",
+                            "fstype": "mqueue",
+                            "options": "rw,nosuid,nodev,noexec,relatime"
+                        }
+                    ]
+                },
+                {
+                    "target": "/run",
+                    "source": "tmpfs",
+                    "fstype": "tmpfs",
+                    "options": "rw,nosuid,noexec,relatime,size=206720k,mode=755",
+                    "children": [
+                        {
+                            "target": "/run/lock",
+                            "source": "tmpfs",
+                            "fstype": "tmpfs",
+                            "options": "rw,nosuid,nodev,noexec,relatime,size=5120k"
+                        }
+                    ]
+                },
+                {
+                    "target": "/cdrom",
+                    "source": "/dev/sr0",
+                    "fstype": "iso9660",
+                    "options": "ro,noatime,nojoliet,check=s,map=n,blocksize=2048"
+                },
+                {
+                    "target": "/rofs",
+                    "source": "/dev/loop0",
+                    "fstype": "squashfs",
+                    "options": "ro,noatime"
+                },
+                {
+                    "target": "/usr/lib/modules",
+                    "source": "/dev/loop2",
+                    "fstype": "squashfs",
+                    "options": "ro,relatime"
+                },
+                {
+                    "target": "/media/filesystem",
+                    "source": "/dev/loop0",
+                    "fstype": "squashfs",
+                    "options": "ro,relatime"
+                },
+                {
+                    "target": "/tmp",
+                    "source": "tmpfs",
+                    "fstype": "tmpfs",
+                    "options": "rw,nosuid,nodev,relatime"
+                },
+                {
+                    "target": "/subiquity_config",
+                    "source": "/dev/vdd",
+                    "fstype": "ext4",
+                    "options": "ro,relatime"
+                },
+                {
+                    "target": "/snap/core/8041",
+                    "source": "/dev/loop3",
+                    "fstype": "squashfs",
+                    "options": "ro,nodev,relatime"
+                },
+                {
+                    "target": "/snap/subiquity/1335",
+                    "source": "/dev/loop4",
+                    "fstype": "squashfs",
+                    "options": "ro,nodev,relatime"
+                },
+                {
+                    "target": "/target",
+                    "source": "/dev/md1p1",
+                    "fstype": "ext4",
+                    "options": "rw,relatime",
+                    "children": [
+                        {
+                            "target": "/target/run",
+                            "source": "tmpfs",
+                            "fstype": "tmpfs",
+                            "options": "rw,nosuid,noexec,relatime,size=206720k,mode=755"
+                        },
+                        {
+                            "target": "/target/boot",
+                            "source": "/dev/vda2",
+                            "fstype": "ext4",
+                            "options": "rw,relatime"
+                        },
+                        {
+                            "target": "/target/etc/apt",
+                            "source": "overlay",
+                            "fstype": "overlay",
+                            "options": "rw,relatime,lowerdir=/target/etc/apt,upperdir=/tmp/tmp.dFi4ai53r1/upper,workdir=/tmp/tmp.dFi4ai53r1/work"
+                        },
+                        {
+                            "target": "/target/cdrom",
+                            "source": "/dev/sr0",
+                            "fstype": "iso9660",
+                            "options": "ro,noatime,nojoliet,check=s,map=n,blocksize=2048"
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "filesystem": {
+        "/dev/sr0": {
+            "APPLICATION_ID": "GENISOIMAGE\\x20ISO\\x209660\\x2fHFS\\x20FILESYSTEM\\x20CREATOR\\x20\\x28C\\x29\\x201993\\x20E.YOUNGDALE\\x20\\x28C\\x29\\x201997-2006\\x20J.PEARSON\\x2fJ.SCHILLING\\x20\\x28C\\x29\\x202006-2007\\x20CDRKIT\\x20TEAM",
+            "LABEL": "Ubuntu-Server_20.04_LTS_ppc64",
+            "LABEL_ENC": "Ubuntu-Server\\x2020.04\\x20LTS\\x20ppc64",
+            "SYSTEM_ID": "LINUX",
+            "TYPE": "iso9660",
+            "USAGE": "filesystem",
+            "UUID": "2019-11-16-08-09-20-00",
+            "UUID_ENC": "2019-11-16-08-09-20-00"
+        },
+        "/dev/vda2": {
+            "TYPE": "ext4",
+            "USAGE": "filesystem",
+            "UUID": "0a3b5403-d358-4f30-9094-e5a19d60b222",
+            "UUID_ENC": "0a3b5403-d358-4f30-9094-e5a19d60b222",
+            "VERSION": "1.0"
+        },
+        "/dev/vdd": {
+            "TYPE": "ext2",
+            "USAGE": "filesystem",
+            "UUID": "00c629d6-06ab-4dfd-b21e-c3186f34105d",
+            "UUID_ENC": "00c629d6-06ab-4dfd-b21e-c3186f34105d",
+            "VERSION": "1.0"
+        },
+        "/dev/md1p1": {
+            "TYPE": "ext4",
+            "USAGE": "filesystem",
+            "UUID": "b312e605-d330-43ad-aa9b-2d503412977d",
+            "UUID_ENC": "b312e605-d330-43ad-aa9b-2d503412977d",
+            "VERSION": "1.0"
+        }
+    },
+    "raid": {
+        "/dev/md1": {
+            "DEVLINKS": "/dev/disk/by-id/md-name-ubuntu-server:1 /dev/disk/by-id/md-uuid-1e4e3ac4:abd1ee76:6fdb871a:4d6677af",
+            "DEVNAME": "/dev/md1",
+            "DEVPATH": "/devices/virtual/block/md1",
+            "DEVTYPE": "disk",
+            "ID_PART_TABLE_TYPE": "gpt",
+            "ID_PART_TABLE_UUID": "18f354ee-3557-4a37-9508-c947edb21b5c",
+            "MAJOR": "9",
+            "MD_DEVICES": "2",
+            "MD_DEVICE_ev_vdb1_DEV": "/dev/vdb1",
+            "MD_DEVICE_ev_vdb1_ROLE": "0",
+            "MD_DEVICE_ev_vdc1_DEV": "/dev/vdc1",
+            "MD_DEVICE_ev_vdc1_ROLE": "1",
+            "MD_LEVEL": "raid1",
+            "MD_METADATA": "1.2",
+            "MD_NAME": "ubuntu-server:1",
+            "MD_UUID": "1e4e3ac4:abd1ee76:6fdb871a:4d6677af",
+            "MINOR": "1",
+            "SUBSYSTEM": "block",
+            "SYSTEMD_WANTS": "mdmonitor.service",
+            "TAGS": ":systemd:",
+            "USEC_INITIALIZED": "52972570",
+            "raidlevel": "raid1",
+            "devices": [
+                "/dev/vdb1",
+                "/dev/vdc1"
+            ],
+            "spare_devices": []
+        }
+    },
+    "multipath": {}
+}
diff --git a/tests/data/probert_storage_zlp6.json b/tests/data/probert_storage_zlp6.json
new file mode 100644
index 0000000..b56a02b
--- /dev/null
+++ b/tests/data/probert_storage_zlp6.json
@@ -0,0 +1,6980 @@
+{
+    "storage": {
+        "bcache": {
+            "backing": {},
+            "caching": {}
+        },
+        "blockdev": {
+            "/dev/dasda": {
+                "DEVLINKS": "/dev/disk/by-id/ccw-IBM.750000000DXP71.1500.20 /dev/disk/by-path/ccw-0.0.1520 /dev/disk/by-uuid/3f168f0c-d0c7-4d8b-b23d-92c7476b092b",
+                "DEVNAME": "/dev/dasda",
+                "DEVPATH": "/devices/css0/0.0.0180/0.0.1520/block/dasda",
+                "DEVTYPE": "disk",
+                "ID_BUS": "ccw",
+                "ID_FS_TYPE": "bcache",
+                "ID_FS_UUID": "3f168f0c-d0c7-4d8b-b23d-92c7476b092b",
+                "ID_FS_UUID_ENC": "3f168f0c-d0c7-4d8b-b23d-92c7476b092b",
+                "ID_PATH": "ccw-0.0.1520",
+                "ID_PATH_TAG": "ccw-0_0_1520",
+                "ID_TYPE": "disk",
+                "ID_UID": "IBM.750000000DXP71.1500.20",
+                "ID_XUID": "IBM.750000000DXP71.1500.20",
+                "MAJOR": "94",
+                "MINOR": "0",
+                "MPATH_SBIN_PATH": "/sbin",
+                "SUBSYSTEM": "block",
+                "TAGS": ":systemd:",
+                "USEC_INITIALIZED": "9522332",
+                "attrs": {
+                    "alignment_offset": "0",
+                    "bdi": null,
+                    "capability": "10",
+                    "dev": "94:0",
+                    "device": null,
+                    "discard_alignment": "0",
+                    "ext_range": "4",
+                    "hidden": "0",
+                    "inflight": "       0        0",
+                    "range": "4",
+                    "removable": "0",
+                    "ro": "0",
+                    "size": "59082670080",
+                    "stat": "   16869        0  1012184     2450    12685   171372  4061544    74710        0 56227200 56332580",
+                    "subsystem": "block",
+                    "uevent": "MAJOR=94\nMINOR=0\nDEVNAME=dasda\nDEVTYPE=disk"
+                }
+            },
+            "/dev/dasdb": {
+                "DEVLINKS": "/dev/disk/by-id/ccw-IBM.750000000DXP71.1500.1f /dev/disk/by-id/ccw-0X151F /dev/disk/by-path/ccw-0.0.151f",
+                "DEVNAME": "/dev/dasdb",
+                "DEVPATH": "/devices/css0/0.0.017f/0.0.151f/block/dasdb",
+                "DEVTYPE": "disk",
+                "ID_BUS": "ccw",
+                "ID_PATH": "ccw-0.0.151f",
+                "ID_PATH_TAG": "ccw-0_0_151f",
+                "ID_SERIAL": "0X151F",
+                "ID_TYPE": "disk",
+                "ID_UID": "IBM.750000000DXP71.1500.1f",
+                "ID_XUID": "IBM.750000000DXP71.1500.1f",
+                "MAJOR": "94",
+                "MINOR": "4",
+                "MPATH_SBIN_PATH": "/sbin",
+                "SUBSYSTEM": "block",
+                "TAGS": ":systemd:",
+                "USEC_INITIALIZED": "9552537",
+                "attrs": {
+                    "alignment_offset": "0",
+                    "bdi": null,
+                    "capability": "10",
+                    "dev": "94:4",
+                    "device": null,
+                    "discard_alignment": "0",
+                    "ext_range": "4",
+                    "hidden": "0",
+                    "inflight": "       0        0",
+                    "range": "4",
+                    "removable": "0",
+                    "ro": "0",
+                    "size": "59082670080",
+                    "stat": "    2590        0    61872      750        0        0        0        0        0 1514773090 1514775410",
+                    "subsystem": "block",
+                    "uevent": "MAJOR=94\nMINOR=4\nDEVNAME=dasdb\nDEVTYPE=disk"
+                }
+            },
+            "/dev/dasdb1": {
+                "DEVLINKS": "/dev/disk/by-uuid/45824f3e-2b61-48c6-912f-6142ce21827c /dev/disk/by-id/ccw-IBM.750000000DXP71.1500.1f-part1 /dev/disk/by-path/ccw-0.0.151f-part1 /dev/disk/by-id/ccw-0X151F-part1",
+                "DEVNAME": "/dev/dasdb1",
+                "DEVPATH": "/devices/css0/0.0.017f/0.0.151f/block/dasdb/dasdb1",
+                "DEVTYPE": "partition",
+                "ID_BUS": "ccw",
+                "ID_FS_TYPE": "ext4",
+                "ID_FS_USAGE": "filesystem",
+                "ID_FS_UUID": "45824f3e-2b61-48c6-912f-6142ce21827c",
+                "ID_FS_UUID_ENC": "45824f3e-2b61-48c6-912f-6142ce21827c",
+                "ID_FS_VERSION": "1.0",
+                "ID_PATH": "ccw-0.0.151f",
+                "ID_PATH_TAG": "ccw-0_0_151f",
+                "ID_SCSI": "1",
+                "ID_SERIAL": "0X151F",
+                "ID_TYPE": "disk",
+                "ID_UID": "IBM.750000000DXP71.1500.1f",
+                "ID_XUID": "IBM.750000000DXP71.1500.1f",
+                "MAJOR": "94",
+                "MINOR": "5",
+                "PARTN": "1",
+                "SUBSYSTEM": "block",
+                "TAGS": ":systemd:",
+                "USEC_INITIALIZED": "1279563953260",
+                "attrs": {
+                    "alignment_offset": "0",
+                    "dev": "94:5",
+                    "discard_alignment": "0",
+                    "inflight": "       0        0",
+                    "partition": "1",
+                    "ro": "0",
+                    "size": "6144000000",
+                    "start": "192",
+                    "stat": "     128        0     5568      160        0        0        0        0        0      280      280",
+                    "subsystem": "block",
+                    "uevent": "MAJOR=94\nMINOR=5\nDEVNAME=dasdb1\nDEVTYPE=partition\nPARTN=1"
+                }
+            },
+            "/dev/dasdb2": {
+                "DEVLINKS": "/dev/disk/by-id/ccw-0X151F-part2 /dev/disk/by-id/ccw-IBM.750000000DXP71.1500.1f-part2 /dev/disk/by-uuid/07c44238-17da-4548-8f94-046e5c1251d3 /dev/disk/by-path/ccw-0.0.151f-part2",
+                "DEVNAME": "/dev/dasdb2",
+                "DEVPATH": "/devices/css0/0.0.017f/0.0.151f/block/dasdb/dasdb2",
+                "DEVTYPE": "partition",
+                "ID_BUS": "ccw",
+                "ID_FS_TYPE": "crypto_LUKS",
+                "ID_FS_USAGE": "crypto",
+                "ID_FS_UUID": "07c44238-17da-4548-8f94-046e5c1251d3",
+                "ID_FS_UUID_ENC": "07c44238-17da-4548-8f94-046e5c1251d3",
+                "ID_FS_VERSION": "2",
+                "ID_PATH": "ccw-0.0.151f",
+                "ID_PATH_TAG": "ccw-0_0_151f",
+                "ID_SCSI": "1",
+                "ID_SERIAL": "0X151F",
+                "ID_TYPE": "disk",
+                "ID_UID": "IBM.750000000DXP71.1500.1f",
+                "ID_XUID": "IBM.750000000DXP71.1500.1f",
+                "MAJOR": "94",
+                "MINOR": "6",
+                "PARTN": "2",
+                "SUBSYSTEM": "block",
+                "TAGS": ":systemd:",
+                "USEC_INITIALIZED": "1279563871011",
+                "attrs": {
+                    "alignment_offset": "0",
+                    "dev": "94:6",
+                    "discard_alignment": "0",
+                    "inflight": "       0        0",
+                    "partition": "2",
+                    "ro": "0",
+                    "size": "52937490432",
+                    "start": "1500192",
+                    "stat": "     113        0     1832      200        0        0        0        0        0      230      320",
+                    "subsystem": "block",
+                    "uevent": "MAJOR=94\nMINOR=6\nDEVNAME=dasdb2\nDEVTYPE=partition\nPARTN=2"
+                }
+            },
+            "/dev/dasdc": {
+                "DEVLINKS": "/dev/disk/by-path/ccw-0.0.1522 /dev/disk/by-id/ccw-IBM.750000000DXP71.1500.22 /dev/disk/by-id/ccw-0X1522",
+                "DEVNAME": "/dev/dasdc",
+                "DEVPATH": "/devices/css0/0.0.0182/0.0.1522/block/dasdc",
+                "DEVTYPE": "disk",
+                "ID_BUS": "ccw",
+                "ID_PATH": "ccw-0.0.1522",
+                "ID_PATH_TAG": "ccw-0_0_1522",
+                "ID_SERIAL": "0X1522",
+                "ID_TYPE": "disk",
+                "ID_UID": "IBM.750000000DXP71.1500.22",
+                "ID_XUID": "IBM.750000000DXP71.1500.22",
+                "MAJOR": "94",
+                "MINOR": "8",
+                "MPATH_SBIN_PATH": "/sbin",
+                "SUBSYSTEM": "block",
+                "TAGS": ":systemd:",
+                "USEC_INITIALIZED": "9503072",
+                "attrs": {
+                    "alignment_offset": "0",
+                    "bdi": null,
+                    "capability": "10",
+                    "dev": "94:8",
+                    "device": null,
+                    "discard_alignment": "0",
+                    "ext_range": "4",
+                    "hidden": "0",
+                    "inflight": "       0        0",
+                    "range": "4",
+                    "removable": "0",
+                    "ro": "0",
+                    "size": "59082670080",
+                    "stat": "   46350        0  3209608     4010    55144   368331 13826720   190440        0 1083958950 1084285940",
+                    "subsystem": "block",
+                    "uevent": "MAJOR=94\nMINOR=8\nDEVNAME=dasdc\nDEVTYPE=disk"
+                }
+            },
+            "/dev/dasdc1": {
+                "DEVLINKS": "/dev/disk/by-id/ccw-IBM.750000000DXP71.1500.22-part1 /dev/disk/by-id/ccw-0X1522-part1 /dev/disk/by-path/ccw-0.0.1522-part1",
+                "DEVNAME": "/dev/dasdc1",
+                "DEVPATH": "/devices/css0/0.0.0182/0.0.1522/block/dasdc/dasdc1",
+                "DEVTYPE": "partition",
+                "ID_BUS": "ccw",
+                "ID_PATH": "ccw-0.0.1522",
+                "ID_PATH_TAG": "ccw-0_0_1522",
+                "ID_SCSI": "1",
+                "ID_SERIAL": "0X1522",
+                "ID_TYPE": "disk",
+                "ID_UID": "IBM.750000000DXP71.1500.22",
+                "ID_XUID": "IBM.750000000DXP71.1500.22",
+                "MAJOR": "94",
+                "MINOR": "9",
+                "PARTN": "1",
+                "SUBSYSTEM": "block",
+                "TAGS": ":systemd:",
+                "USEC_INITIALIZED": "1279589828313",
+                "attrs": {
+                    "alignment_offset": "0",
+                    "dev": "94:9",
+                    "discard_alignment": "0",
+                    "inflight": "       0        0",
+                    "partition": "1",
+                    "ro": "0",
+                    "size": "17180786688",
+                    "start": "192",
+                    "stat": "     102        0     5328      140        0        0        0        0        0      210      210",
+                    "subsystem": "block",
+                    "uevent": "MAJOR=94\nMINOR=9\nDEVNAME=dasdc1\nDEVTYPE=partition\nPARTN=1"
+                }
+            },
+            "/dev/dasdc2": {
+                "DEVLINKS": "/dev/disk/by-id/ccw-IBM.750000000DXP71.1500.22-part2 /dev/disk/by-path/ccw-0.0.1522-part2 /dev/disk/by-id/ccw-0X1522-part2",
+                "DEVNAME": "/dev/dasdc2",
+                "DEVPATH": "/devices/css0/0.0.0182/0.0.1522/block/dasdc/dasdc2",
+                "DEVTYPE": "partition",
+                "ID_BUS": "ccw",
+                "ID_PATH": "ccw-0.0.1522",
+                "ID_PATH_TAG": "ccw-0_0_1522",
+                "ID_SCSI": "1",
+                "ID_SERIAL": "0X1522",
+                "ID_TYPE": "disk",
+                "ID_UID": "IBM.750000000DXP71.1500.22",
+                "ID_XUID": "IBM.750000000DXP71.1500.22",