Merge ~raharper/curtin:ubuntu/devel/release-18.2 into curtin:ubuntu/devel

[Ryan Harper]

curtin (18.2-0ubuntu1) disco; urgency=medium

  * New upstream release (18.2).
    - Release 18.2
    - Adjust helpers/common to edit GRUB_CMDLINE_LINUX_DEFAULT in place.
      (LP: #1527664)
    - dname: persistent names based on serial or wwn (LP: #1735839)
    - Fix bug in is_swap_device if a device was smaller than page_size.
      (LP: #1803672)
    - vmtest: add disco tests [Joshua Powers]
    - unittest: change directory to tmpdir for testing relative files.
    - Add clear-holders to meta-simple (LP: #1786736)
    - vmtests: check install log for Out of memory kernel messages and fail
    - unittest: correctly use tmpdir for my.img [Joshua Powers] (LP: #1803611)
    - block_meta: use wipe config when clearing partitions (LP: #1800153)
    - tests: fix vmtests for apt perserve_source_list changes
    - apt: Use new format apt config when writing preserve_sources_list.
      (LP: #1735950)
    - vmtests: multipath mount /home with nofail and validate in unittest
    - vmtests: fix common collect scripts to not exit failure.
    - vmtest: handle collect disk unpack failure
    - vmtests: dont use multiple subclasses in uefi 4k tests
    - vmtests: disable snapd/seeding to avoid boot hang
    - jenkins-runner: fix when using --filter only

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

PASSED: Continuous integration, rev:ce1e3c1d2e9cc1927b07a2dad105820ac80c8948
https://jenkins.ubuntu.com/server/job/curtin-ci/1144/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/1144
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/1144
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/1144
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/1144

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

review: Approve (continuous-integration)

diff --git a/curtin/__init__.py b/curtin/__init__.py
index ee35ca3..a307e84 100644
--- a/curtin/__init__.py
+++ b/curtin/__init__.py
@@ -30,6 +30,6 @@ FEATURES = [
     'HAS_VERSION_MODULE',
 ]
 
-__version__ = "18.1"
+__version__ = "18.2"
 
 # vi: ts=4 expandtab syntax=python
diff --git a/curtin/commands/apt_config.py b/curtin/commands/apt_config.py
index 9ce25b3..8bd6e79 100644
--- a/curtin/commands/apt_config.py
+++ b/curtin/commands/apt_config.py
@@ -10,7 +10,6 @@ import glob
 import os
 import re
 import sys
-import yaml
 
 from curtin.log import LOG
 from curtin import (config, distro, gpg, paths, util)
@@ -71,6 +70,7 @@ def handle_apt(cfg, target=None):
     if not config.value_as_boolean(cfg.get('preserve_sources_list',
                                            True)):
         generate_sources_list(cfg, release, mirrors, target)
+        apply_preserve_sources_list(target)
         rename_apt_lists(mirrors, target)
 
     try:
@@ -318,16 +318,32 @@ def generate_sources_list(cfg, release, mirrors, target=None):
     disabled = disable_suites(cfg.get('disable_suites'), rendered, release)
     util.write_file(paths.target_path(target, aptsrc), disabled, mode=0o644)
 
+
+def apply_preserve_sources_list(target):
     # protect the just generated sources.list from cloud-init
     cloudfile = "/etc/cloud/cloud.cfg.d/curtin-preserve-sources.cfg"
-    # this has to work with older cloud-init as well, so use old key
-    cloudconf = yaml.dump({'apt_preserve_sources_list': True}, indent=1)
+
+    target_ver = distro.get_package_version('cloud-init', target=target)
+    if not target_ver:
+        LOG.info("Attempt to read cloud-init version from target returned "
+                 "'%s', not writing preserve_sources_list config.",
+                 target_ver)
+        return
+
+    cfg = {'apt': {'preserve_sources_list': True}}
+    if target_ver['major'] < 1:
+        # anything cloud-init 0.X.X will get the old config key.
+        cfg = {'apt_preserve_sources_list': True}
+
     try:
         util.write_file(paths.target_path(target, cloudfile),
-                        cloudconf, mode=0o644)
+                        config.dump_config(cfg), mode=0o644)
+        LOG.debug("Set preserve_sources_list to True in %s with: %s",
+                  cloudfile, cfg)
     except IOError:
-        LOG.exception("Failed to protect source.list from cloud-init in (%s)",
-                      paths.target_path(target, cloudfile))
+        LOG.exception(
+            "Failed to protect /etc/apt/sources.list from cloud-init in '%s'",
+            cloudfile)
         raise
 
 
diff --git a/curtin/commands/block_meta.py b/curtin/commands/block_meta.py
index 197c1fd..8decab5 100644
--- a/curtin/commands/block_meta.py
+++ b/curtin/commands/block_meta.py
@@ -8,7 +8,8 @@ from curtin.log import LOG, logged_time
 from curtin.reporter import events
 
 from . import populate_one_subcmd
-from curtin.udev import compose_udev_equality, udevadm_settle, udevadm_trigger
+from curtin.udev import (compose_udev_equality, udevadm_settle,
+                         udevadm_trigger, udevadm_info)
 
 import glob
 import os
@@ -35,6 +36,8 @@ CMD_ARGUMENTS = (
        'metavar': 'DEVICE', 'default': None, }),
      ('--fstype', {'help': 'root partition filesystem type',
                    'choices': ['ext4', 'ext3'], 'default': 'ext4'}),
+     ('--force-mode', {'help': 'force mode, disable mode detection',
+                       'action': 'store_true', 'default': False}),
      (('-t', '--target'),
       {'help': 'chroot to target. default is env[TARGET_MOUNT_POINT]',
        'action': 'store', 'metavar': 'TARGET',
@@ -55,11 +58,35 @@ def block_meta(args):
     state = util.load_command_environment()
     cfg = config.load_command_config(args, state)
     dd_images = util.get_dd_images(cfg.get('sources', {}))
-    if ((args.mode == CUSTOM or cfg.get("storage") is not None) and
-            len(dd_images) == 0):
-        meta_custom(args)
-    elif args.mode in (SIMPLE, SIMPLE_BOOT) or len(dd_images) > 0:
-        meta_simple(args)
+
+    # run clear holders on potential devices
+    devices = args.devices
+    if devices is None:
+        devices = []
+        if 'storage' in cfg:
+            devices = get_disk_paths_from_storage_config(
+                extract_storage_ordered_dict(cfg))
+        if len(devices) == 0:
+            devices = cfg.get('block-meta', {}).get('devices', [])
+        LOG.debug('Declared block devices: %s', devices)
+        args.devices = devices
+
+    meta_clear(devices, state.get('report_stack_prefix', ''))
+
+    # dd-images requires use of meta_simple
+    if len(dd_images) > 0 and args.force_mode is False:
+        LOG.info('blockmeta: detected dd-images, using mode=simple')
+        return meta_simple(args)
+
+    if cfg.get("storage") and args.force_mode is False:
+        LOG.info('blockmeta: detected storage config, using mode=custom')
+        return meta_custom(args)
+
+    LOG.info('blockmeta: mode=%s force=%s', args.mode, args.force_mode)
+    if args.mode == CUSTOM:
+        return meta_custom(args)
+    elif args.mode in (SIMPLE, SIMPLE_BOOT):
+        return meta_simple(args)
     else:
         raise NotImplementedError("mode=%s is not implemented" % args.mode)
 
@@ -195,12 +222,43 @@ def sanitize_dname(dname):
     return ''.join(c if c in valid else '-' for c in dname)
 
 
+def make_dname_byid(path, error_msg=None, info=None):
+    """ Returns a list of udev equalities for a given disk path
+
+    :param path: string of a kernel device path to a block device
+    :param error_msg: more information about path for log/errors
+    :param info: dict of udevadm info key, value pairs of device specified by
+                 path.
+    :returns: list of udev equalities (lists)
+    :raises: ValueError if path is not a disk.
+    :raises: RuntimeError if there is no serial or wwn.
+    """
+    error_msg = str(path) + ("" if not error_msg else " [%s]" % error_msg)
+    if info is None:
+        info = udevadm_info(path=path)
+    devtype = info.get('DEVTYPE')
+    if devtype != "disk":
+        raise ValueError(
+            "Disk tag udev rules are only for disks, %s has devtype=%s" %
+            (error_msg, devtype))
+
+    byid_keys = ['ID_SERIAL', 'ID_WWN_WITH_EXTENSION']
+    present = [k for k in byid_keys if info.get(k)]
+    if not present:
+        raise RuntimeError(
+            "Cannot create disk tag udev rule for %s, "
+            "missing 'serial' or 'wwn' value" % error_msg)
+
+    return [[compose_udev_equality('ENV{%s}' % k, info[k]) for k in present]]
+
+
 def make_dname(volume, storage_config):
     state = util.load_command_environment()
     rules_dir = os.path.join(state['scratch'], "rules.d")
     vol = storage_config.get(volume)
     path = get_path_to_storage_volume(volume, storage_config)
     ptuuid = None
+    byid = None
     dname = vol.get('name')
     if vol.get('type') in ["partition", "disk"]:
         (out, _err) = util.subp(["blkid", "-o", "export", path], capture=True,
@@ -209,28 +267,41 @@ def make_dname(volume, storage_config):
             if "PTUUID" in line or "PARTUUID" in line:
                 ptuuid = line.split('=')[-1]
                 break
+        if vol.get('type') == 'disk':
+            byid = make_dname_byid(path, error_msg="id=%s" % vol.get('id'))
     # we may not always be able to find a uniq identifier on devices with names
-    if not ptuuid and vol.get('type') in ["disk", "partition"]:
+    if (not ptuuid and not byid) and vol.get('type') in ["disk", "partition"]:
         LOG.warning("Can't find a uuid for volume: {}. Skipping dname.".format(
             volume))
         return
 
-    rule = [
+    matches = []
+    base_rule = [
         compose_udev_equality("SUBSYSTEM", "block"),
         compose_udev_equality("ACTION", "add|change"),
         ]
     if vol.get('type') == "disk":
-        rule.append(compose_udev_equality('ENV{DEVTYPE}', "disk"))
-        rule.append(compose_udev_equality('ENV{ID_PART_TABLE_UUID}', ptuuid))
+        if ptuuid:
+            matches += [[compose_udev_equality('ENV{DEVTYPE}', "disk"),
+                        compose_udev_equality('ENV{ID_PART_TABLE_UUID}',
+                                              ptuuid)]]
+        for rule in byid:
+            matches += [
+                [compose_udev_equality('ENV{DEVTYPE}', "disk")] + rule]
     elif vol.get('type') == "partition":
-        rule.append(compose_udev_equality('ENV{DEVTYPE}', "partition"))
-        dname = storage_config.get(vol.get('device')).get('name') + \
-            "-part%s" % determine_partition_number(volume, storage_config)
-        rule.append(compose_udev_equality('ENV{ID_PART_ENTRY_UUID}', ptuuid))
+        # if partition has its own name, bind that to the existing PTUUID
+        if dname:
+            matches += [[compose_udev_equality('ENV{DEVTYPE}', "partition"),
+                        compose_udev_equality('ENV{ID_PART_ENTRY_UUID}',
+                                              ptuuid)]]
+        else:
+            # disks generate dname-part%n rules automatically
+            LOG.debug('No partition-specific dname')
+            return
     elif vol.get('type') == "raid":
         md_data = mdadm.mdadm_query_detail(path)
         md_uuid = md_data.get('MD_UUID')
-        rule.append(compose_udev_equality("ENV{MD_UUID}", md_uuid))
+        matches += [[compose_udev_equality("ENV{MD_UUID}", md_uuid)]]
     elif vol.get('type') == "bcache":
         # bind dname to bcache backing device's dev.uuid as the bcache minor
         # device numbers are not stable across reboots.
@@ -239,12 +310,12 @@ def make_dname(volume, storage_config):
         bcache_super = bcache.superblock_asdict(device=backing_dev)
         if bcache_super and bcache_super['sb.version'].startswith('1'):
                 bdev_uuid = bcache_super['dev.uuid']
-        rule.append(compose_udev_equality("ENV{CACHED_UUID}", bdev_uuid))
+        matches += [[compose_udev_equality("ENV{CACHED_UUID}", bdev_uuid)]]
         bcache.write_label(sanitize_dname(dname), backing_dev)
     elif vol.get('type') == "lvm_partition":
         volgroup_name = storage_config.get(vol.get('volgroup')).get('name')
         dname = "%s-%s" % (volgroup_name, dname)
-        rule.append(compose_udev_equality("ENV{DM_NAME}", dname))
+        matches += [[compose_udev_equality("ENV{DM_NAME}", dname)]]
     else:
         raise ValueError('cannot make dname for device with type: {}'
                          .format(vol.get('type')))
@@ -257,11 +328,25 @@ def make_dname(volume, storage_config):
         LOG.warning(
             "dname modified to remove invalid chars. old: '{}' new: '{}'"
             .format(dname, sanitized))
-    rule.append("SYMLINK+=\"disk/by-dname/%s\"\n" % sanitized)
-    LOG.debug("Writing dname udev rule '{}'".format(str(rule)))
+    content = ['# Written by curtin']
+    for match in matches:
+        rule = (base_rule + match +
+                ["SYMLINK+=\"disk/by-dname/%s\"\n" % sanitized])
+        LOG.debug("Creating dname udev rule '{}'".format(str(rule)))
+        content.append(', '.join(rule))
+
+    if vol.get('type') == 'disk':
+        for brule in byid:
+            rule = (base_rule +
+                    [compose_udev_equality('ENV{DEVTYPE}', 'partition')] +
+                    brule +
+                    ['SYMLINK+="disk/by-dname/%s-part%%n"\n' % sanitized])
+            LOG.debug("Creating dname udev rule '{}'".format(str(rule)))
+            content.append(', '.join(rule))
+
     util.ensure_dir(rules_dir)
     rule_file = os.path.join(rules_dir, '{}.rules'.format(sanitized))
-    util.write_file(rule_file, ', '.join(rule))
+    util.write_file(rule_file, '\n'.join(content))
 
 
 def get_poolname(info, storage_config):
@@ -584,6 +669,9 @@ def partition_handler(info, storage_config):
             block.zero_file_at_offsets(disk, [wipe_offset], exclusive=False)
 
     if disk_ptable == "msdos":
+        if flag and flag == 'prep':
+            raise ValueError('PReP partitions require a GPT partition table')
+
         if flag in ["extended", "logical", "primary"]:
             partition_type = flag
         else:
@@ -604,6 +692,16 @@ def partition_handler(info, storage_config):
     else:
         raise ValueError("parent partition has invalid partition table")
 
+    # wipe the created partition if needed, superblocks have already been wiped
+    wipe_mode = info.get('wipe', 'superblock')
+    if wipe_mode != 'superblock':
+        part_path = block.dev_path(block.partition_kname(disk_kname,
+                                                         partnumber))
+        block.rescan_block_devices([disk])
+        udevadm_settle(exists=part_path)
+        LOG.debug('Wiping partition %s mode=%s', part_path, wipe_mode)
+        block.wipe_volume(part_path, mode=wipe_mode, exclusive=False)
+
     # Make the name if needed
     if storage_config.get(device).get('name') and partition_type != 'extended':
         make_dname(info.get('id'), storage_config)
@@ -1335,6 +1433,19 @@ def extract_storage_ordered_dict(config):
     return OrderedDict((d["id"], d) for (i, d) in enumerate(scfg))
 
 
+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.
+
+    :param: storage_config: Ordered dict of storage configation
+    """
+    return [get_path_to_storage_volume(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'))]
+
+
 def zfsroot_update_storage_config(storage_config):
     """Return an OrderedDict that has 'zfsroot' format expanded into
        zpool and zfs commands to enable ZFS on rootfs.
@@ -1429,6 +1540,24 @@ def zfsroot_update_storage_config(storage_config):
     return ret
 
 
+def meta_clear(devices, report_prefix=''):
+    """ Run clear_holders on specified list of devices.
+
+    :param: devices: a list of block devices (/dev/XXX) to be cleared
+    :param: report_prefix: a string to pass to the ReportEventStack
+    """
+    # shut down any already existing storage layers above any disks used in
+    # config that have 'wipe' set
+    with events.ReportEventStack(
+            name=report_prefix + '/clear-holders',
+            reporting_enabled=True, level='INFO',
+            description="removing previous storage devices"):
+        clear_holders.start_clear_holders_deps()
+        clear_holders.clear_holders(devices)
+        # if anything was not properly shut down, stop installation
+        clear_holders.assert_clear(devices)
+
+
 def meta_custom(args):
     """Does custom partitioning based on the layout provided in the config
     file. Section with the name storage contains information on which
@@ -1460,21 +1589,6 @@ def meta_custom(args):
     # set up reportstack
     stack_prefix = state.get('report_stack_prefix', '')
 
-    # shut down any already existing storage layers above any disks used in
-    # config that have 'wipe' set
-    with events.ReportEventStack(
-            name=stack_prefix, reporting_enabled=True, level='INFO',
-            description="removing previous storage devices"):
-        clear_holders.start_clear_holders_deps()
-        disk_paths = [get_path_to_storage_volume(k, storage_config_dict)
-                      for (k, v) in storage_config_dict.items()
-                      if v.get('type') == 'disk' and
-                      config.value_as_boolean(v.get('wipe')) and
-                      not config.value_as_boolean(v.get('preserve'))]
-        clear_holders.clear_holders(disk_paths)
-        # if anything was not properly shut down, stop installation
-        clear_holders.assert_clear(disk_paths)
-
     for item_id, command in storage_config_dict.items():
         handler = command_handlers.get(command['type'])
         if not handler:
@@ -1500,8 +1614,15 @@ def meta_simple(args):
     create a separate /boot partition.
     """
     state = util.load_command_environment()
-
     cfg = config.load_command_config(args, state)
+    if args.target is not None:
+        state['target'] = args.target
+
+    if state['target'] is None:
+        sys.stderr.write("Unable to find target.  "
+                         "Use --target or set TARGET_MOUNT_POINT\n")
+        sys.exit(2)
+
     devpath = None
     if cfg.get("storage") is not None:
         for i in cfg["storage"]["config"]:
@@ -1512,21 +1633,8 @@ def meta_simple(args):
             diskPath = block.lookup_disk(serial)
             if grub is True:
                 devpath = diskPath
-            if config.value_as_boolean(i.get('wipe')):
-                block.wipe_volume(diskPath, mode=i.get('wipe'))
-
-    if args.target is not None:
-        state['target'] = args.target
-
-    if state['target'] is None:
-        sys.stderr.write("Unable to find target.  "
-                         "Use --target or set TARGET_MOUNT_POINT\n")
-        sys.exit(2)
 
     devices = args.devices
-    if devices is None:
-        devices = cfg.get('block-meta', {}).get('devices', [])
-
     bootpt = get_bootpt_cfg(
         cfg.get('block-meta', {}).get('boot-partition', {}),
         enabled=args.mode == SIMPLE_BOOT, fstype=args.boot_fstype,
diff --git a/curtin/swap.py b/curtin/swap.py
index 5f77b03..d3f29dc 100644
--- a/curtin/swap.py
+++ b/curtin/swap.py
@@ -103,9 +103,15 @@ def is_swap_device(path):
     https://github.com/torvalds/linux/blob/master/include/linux/swap.h#L111
     """
     LOG.debug('Checking if %s is a swap device', path)
-    swap_magic_offset = resource.getpagesize() - 10
-    magic = util.load_file(path, read_len=10, offset=swap_magic_offset,
-                           decode=False)
+    pagesize = resource.getpagesize()
+    magic_offset = pagesize - 10
+    size = util.file_size(path)
+    if size < magic_offset:
+        LOG.debug("%s is to small for swap (size=%d < pagesize=%d)",
+                  path, size, pagesize)
+        return False
+    magic = util.load_file(
+        path, read_len=10, offset=magic_offset, decode=False)
     LOG.debug('Found swap magic: %s' % magic)
     return magic in [b'SWAPSPACE2', b'SWAP-SPACE']
 # vi: ts=4 expandtab syntax=python
diff --git a/curtin/udev.py b/curtin/udev.py
index 13d9cc5..106a7e7 100644
--- a/curtin/udev.py
+++ b/curtin/udev.py
@@ -61,4 +61,41 @@ def udevadm_trigger(devices):
     util.subp(['udevadm', 'trigger'] + list(devices))
     udevadm_settle()
 
+
+def udevadm_info(path=None):
+    """ Return a dictionary populated by properties of the device specified
+        in the `path` variable via querying udev 'property' database.
+
+    :params: path: path to device, either /dev or /sys
+    :returns: dictionary of key=value pairs as exported from the udev database
+    :raises: ValueError path is None, ProcessExecutionError on exec error.
+    """
+    if not path:
+        raise ValueError('Invalid path: "%s"' % path)
+
+    info_cmd = ['udevadm', 'info', '--query=property', path]
+    output, _ = util.subp(info_cmd, capture=True)
+
+    # strip for trailing empty line
+    info = {}
+    for line in output.splitlines():
+        if not line:
+            continue
+        # maxsplit=2 gives us key and remaininng part of line is value
+        # py2.7 on Trusty doesn't have keyword, pass as argument
+        key, value = line.split('=', 2)
+        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()
+            else:
+                # preserve spaces in values, to match udev database
+                info[key] = value
+
+    return info
+
+
 # vi: ts=4 expandtab syntax=python
diff --git a/debian/changelog b/debian/changelog
index 89bb20f..ef377fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+curtin (18.2-0ubuntu1) disco; urgency=medium
+
+  * New upstream release (18.2).
+    - Release 18.2
+    - Adjust helpers/common to edit GRUB_CMDLINE_LINUX_DEFAULT in place.
+      (LP: #1527664)
+    - dname: persistent names based on serial or wwn (LP: #1735839)
+    - Fix bug in is_swap_device if a device was smaller than page_size.
+      (LP: #1803672)
+    - vmtest: add disco tests [Joshua Powers]
+    - unittest: change directory to tmpdir for testing relative files.
+    - Add clear-holders to meta-simple (LP: #1786736)
+    - vmtests: check install log for Out of memory kernel messages and fail
+    - unittest: correctly use tmpdir for my.img [Joshua Powers] (LP: #1803611)
+    - block_meta: use wipe config when clearing partitions (LP: #1800153)
+    - tests: fix vmtests for apt perserve_source_list changes
+    - apt: Use new format apt config when writing preserve_sources_list.
+      (LP: #1735950)
+    - vmtests: multipath mount /home with nofail and validate in unittest
+    - vmtests: fix common collect scripts to not exit failure.
+    - vmtest: handle collect disk unpack failure
+    - vmtests: dont use multiple subclasses in uefi 4k tests
+    - vmtests: disable snapd/seeding to avoid boot hang
+    - jenkins-runner: fix when using --filter only
+
+ -- Ryan Harper <[e-mail]>  Thu, 06 Dec 2018 12:11:01 -0600
+
 curtin (18.1-59-g0f993084-0ubuntu1) cosmic; urgency=medium
 
   * New upstream snapshot.
diff --git a/doc/topics/apt_source.rst b/doc/topics/apt_source.rst
index 9795361..f996c53 100644
--- a/doc/topics/apt_source.rst
+++ b/doc/topics/apt_source.rst
@@ -165,3 +165,60 @@ Dependencies
 ~~~~~~~~~~~~
 Cloud-init might need to resolve dependencies and install packages in the ephemeral environment to run curtin.
 Therefore it is recommended to not only provide an apt configuration to curtin for the target, but also one to the install environment via cloud-init.
+
+
+apt preserve_sources_list setting
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+cloud-init and curtin treat the ``preserve_sources_list`` setting slightly differently, and thus this setting deserves its own section.
+
+Interpretation / Meaning
+------------------------
+curtin reads ``preserve_sources_list`` to indicate whether or not it should update the target systems' ``/etc/apt/sources.list``.  This includes replacing the mirrors used (apt/primary...).
+
+cloud-init reads ``preserve_sources_list`` to indicate whether or not it should *render* ``/etc/apt/sources.list`` from its built-in template.
+
+defaults
+--------
+Just for reference, the ``preserve_sources_list`` defaults in curtin and cloud-init are:
+
+ * curtin: **true**
+   By default curtin will not modify ``/etc/apt/sources.list`` in the installed OS.  It is assumed that this file is intentionally as it is.
+ * cloud-init: **false**
+ * cloud-init in ephemeral environment: **false**
+ * cloud-init system installed by curtin: **true**
+   (curtin writes this to a file ``/etc/cloud/cloud.cfg.d/curtin-preserve-sources.cfg`` in the target).  It does this because we have already written the sources.list that is desired in the installer.  We do not want cloud-init to overwrite it when it boots.
+
+preserve_sources_list in MAAS
+-----------------------------
+Curtin and cloud-init use the same ``apt`` configuration language.
+MAAS provides apt config in three different scenarios.
+
+ 1. To cloud-init in ephemeral environment (rescue, install or commissioning)
+     Here MAAS **should not send a value**.  If it wants to be explicit it should send ``preserve_sources_list: false``.
+
+ 2. To curtin in curtin config
+     MAAS **should send ``preserve_sources_list: false``**.  curtin will correctly read and update mirrors in official Ubuntu images, so setting this to 'false' is correct. In some cases for custom images, the user might want to be able to have their /etc/apt/sources.list left untouched entirely.  In such cases they may want to override this value.
+
+ 3. To cloud-init via curtin config in debconf_selections.
+     MAAS should **not send a value**.  Curtin will handle telling cloud-init to not update /etc/apt/sources.list.  MAAS does not need to do this.
+
+ 4. To installed system via vendor-data or user-data.
+     MAAS should **not send a value**.  MAAS does not currently send a value.  The user could send one in user-data, but then if they did presumably they did that for a reason.
+
+Legacy format
+-------------
+
+Versions of cloud-init in 14.04 and older only support:
+
+.. code-block:: yaml
+
+    apt_preserve_sources_list: VALUE
+
+Versions of cloud-init present 16.04+ read the "new" style apt configuration, but support the old style configuration also.  The new style configuration is:
+
+.. code-block:: yaml
+
+    apt:
+      preserve_sources_list: VALUE
+
+**Note**: If versions of cloud-init that support the new style config receive conflicting values in old style and new style, cloud-init will raise exception and exit failure.  It simplly doesn't know what behavior is desired.
diff --git a/doc/topics/storage.rst b/doc/topics/storage.rst
index b28964b..f9a9fe8 100644
--- a/doc/topics/storage.rst
+++ b/doc/topics/storage.rst
@@ -175,7 +175,15 @@ not need to be preserved.
 If the ``name`` key is present, curtin will create a udev rule that makes a
 symbolic link to the disk with the given name value. This makes it easy to find
 disks on an installed system. The links are created in
-``/dev/disk/by-dname/<name>``.
+``/dev/disk/by-dname/<name>``.  The udev rules will utilize two types of disk
+metadata to construct the link.  For disks with ``serial`` and/or ``wwn`` values
+these will be used to ensure the name persists even if the contents of the disk
+change.  For legacy purposes, curtin also emits a rule utilizing metadata on
+the disk contents, typically a partition UUID value, this also preserves these
+links for disks which lack persistent attributes such as a ``serial`` or
+``wwn``, typically found on virtualized environments where such values are left
+unset.
+
 A link to each partition on the disk will also be created at
 ``/dev/disk/by-dname/<name>-part<number>``, so if ``name: maindisk`` is set,
 the disk will be at ``/dev/disk/by-dname/maindisk`` and the first partition on
@@ -237,6 +245,14 @@ After the partition is added to the disk's partition table, curtin can run a
 wipe command on the partition. The wipe command values are the sames as for
 disks.
 
+.. note::
+
+  Curtin will automatically wipe 1MB at the starting location of the partition
+  prior to creating the partition to ensure that other block layers or devices
+  do not enable themselves and prevent accessing the partition.  Wipe
+  and other destructive operations only occur if the ``preserve`` value
+  is not set to ``True``.
+
 **flag**: *logical, extended, boot, bios_grub, swap, lvm, raid, home, prep*
 
 If the ``flag`` key is present, curtin will set the specified flag on the
@@ -268,6 +284,17 @@ filesystem or be mounted anywhere on the system.
 If the preserve flag is set to true, curtin will verify that the partition
 exists and will not modify the partition.
 
+**name**: *<name>*
+
+If the ``name`` key is present, curtin will create a udev rule that makes a
+symbolic link to the partition with the given name value. The links are created
+in ``/dev/disk/by-dname/<name>``.
+
+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.
+
+
 **Config Example**::
 
  - id: disk0-part1
@@ -276,6 +303,7 @@ exists and will not modify the partition.
    size: 8GB
    device: disk0
    flag: boot
+   name: boot_partition
 
 .. _format:
 
@@ -496,6 +524,12 @@ scheme for Logical Volumes follows the pattern
 with ``name`` *lv1* on a ``lvm_volgroup`` named *vg1* would have the path
 ``/dev/disk/by-dname/vg1-lv1``.
 
+.. note::
+
+   dname values for contructed devices (such as lvm) only remain persistent
+   as long as the device metadata does not change.  If users modify the device
+   such that device metadata is changed then the udev rule may no longer apply.
+
 **volgroup**: *<volgroup id>*
 
 The ``volgroup`` key specifies the ``id`` of the Volume Group in which to
@@ -592,7 +626,9 @@ The ``name`` key specifies the name of the md device.
 .. note::
 
   Curtin creates a udev rule to create a link to the md device in
-  ``/dev/disk/by-dname/<name>`` using the specified name.
+  ``/dev/disk/by-dname/<name>`` using the specified name.  The dname
+  symbolic link is only persistent as long as the raid metadata is
+  not modifed or destroyed.
 
 **raidlevel**: *0, 1, 5, 6, 10*
 
@@ -669,6 +705,13 @@ reads/writes from the cache.  None effectively disables bcache.
 If the ``name`` key is present, curtin will create a link to the device at
 ``/dev/disk/by-dname/<name>``.
 
+.. note::
+
+   dname values for contructed devices (such as bcache) only remain persistent
+   as long as the device metadata does not change.  If users modify the device
+   such that device metadata is changed then the udev rule may no longer apply.
+
+
 **Config Example**::
 
  - id: bcache0
diff --git a/examples/tests/basic.yaml b/examples/tests/basic.yaml
index 089e776..71730c0 100644
--- a/examples/tests/basic.yaml
+++ b/examples/tests/basic.yaml
@@ -26,6 +26,7 @@ storage:
         number: 3
         size: 1GB
         device: sda
+        name: swap
       - id: sda1_root
         type: format
         fstype: ext4
@@ -83,6 +84,14 @@ storage:
         device: pnum_disk
       - id: pnum_disk_p2
         type: partition
+        number: 2
+        size: 8MB
+        device: pnum_disk
+        flag: prep
+        wipe: zero
+        name: prep
+      - id: pnum_disk_p3
+        type: partition
         number: 10
         size: 1GB
         device: pnum_disk
diff --git a/examples/tests/basic_scsi.yaml b/examples/tests/basic_scsi.yaml
index 5f60459..aa62137 100644
--- a/examples/tests/basic_scsi.yaml
+++ b/examples/tests/basic_scsi.yaml
@@ -20,14 +20,25 @@ storage:
         number: 2
         size: 1GB
         device: sda
+      - id: sda3
+        type: partition
+        number: 3
+        size: 1GB
+        device: sda
+        name: swap
       - id: sda1_root
         type: format
         fstype: ext4
         volume: sda1
+        label: 'cloudimg-rootfs'
       - id: sda2_home
         type: format
         fstype: ext4
         volume: sda2
+      - id: sda3_swap
+        type: format
+        fstype: swap
+        volume: sda3
       - id: sda1_mount
         type: mount
         path: /
@@ -41,6 +52,10 @@ storage:
         wwn: '0x080258d13ea95ae5'
         name: sparedisk
         wipe: superblock
+      - id: sparedisk_fat_fmt_id
+        type: format
+        fstype: fat32
+        volume: sparedisk_id
       - id: btrfs_disk_id
         type: disk
         wwn: '0x22dc58dc023c7008'
@@ -68,6 +83,18 @@ storage:
         device: pnum_disk
       - id: pnum_disk_p2
         type: partition
+        number: 2
+        size: 8MB
+        device: pnum_disk
+        flag: prep
+        wipe: zero
+        name: prep
+      - id: pnum_disk_p3
+        type: partition
         number: 10
         size: 1GB
         device: pnum_disk
+      - id: swap_mnt
+        type: mount
+        path: "none"
+        device: sda3_swap
diff --git a/examples/tests/multipath.yaml b/examples/tests/multipath.yaml
index d4b928c..8447d55 100644
--- a/examples/tests/multipath.yaml
+++ b/examples/tests/multipath.yaml
@@ -36,3 +36,4 @@ storage:
         type: mount
         path: /home
         device: sda2_home
+        options: 'defaults,nofail'
diff --git a/examples/tests/nvme.yaml b/examples/tests/nvme.yaml
index b2a1276..4cf7735 100644
--- a/examples/tests/nvme.yaml
+++ b/examples/tests/nvme.yaml
@@ -44,7 +44,7 @@ storage:
         device: main_disk_home
       - id: nvme_disk
         type: disk
-        path: /dev/nvme0n1
+        serial: nvme-a
         name: nvme_disk
         wipe: superblock
         ptable: gpt
@@ -63,7 +63,7 @@ storage:
         device: nvme_disk
       - id: nvme_disk2
         type: disk
-        path: /dev/nvme1n1
+        serial: nvme-b
         wipe: superblock
         ptable: msdos
         name: second_nvme
diff --git a/examples/tests/nvme_bcache.yaml b/examples/tests/nvme_bcache.yaml
index 2ee0ad3..4fefd94 100644
--- a/examples/tests/nvme_bcache.yaml
+++ b/examples/tests/nvme_bcache.yaml
@@ -19,7 +19,7 @@ storage:
     model: INTEL SSDPEDME400G4
     name: nvme0n1
     ptable: gpt
-    path: /dev/nvme0n1
+    serial: nvme-a
     type: disk
     wipe: superblock
   - device: sda
diff --git a/examples/tests/simple-storage.yaml b/examples/tests/simple-storage.yaml
 new file mode 100644
index 0000000..644c5aa
--- /dev/null
+++ b/examples/tests/simple-storage.yaml
@@ -0,0 +1,48 @@
+# MAAS will send storage config to dd and windows to help pick boot device
+# this test forces curtin down a block-meta simple path along with storage cfg
+partitioning_commands:
+  builtin: [curtin, block-meta, simple, --force-mode]
+showtrace: true
+storage:
+    version: 1
+    config:
+      - id: sda
+        type: disk
+        wipe: superblock
+        ptable: msdos
+        model: QEMU HARDDISK
+        serial: disk-a
+        grub_device: true
+      - id: sdb
+        type: disk
+        wipe: superblock
+        ptable: msdos
+        model: QEMU HARDDISK
+        serial: disk-b
+        wipe: superblock
+      - id: sdc
+        type: disk
+        wipe: superblock
+        ptable: msdos
+        model: QEMU HARDDISK
+        serial: disk-c
+        wipe: superblock
+# This partition config is here to "dirty" the disk
+      - id: sda-part1
+        type: partition
+        device: sda
+        name: sda-part1
+        number: 1
+        size: 3G
+        uuid: ecc1ec63-e8d2-4719-8cee-dd7f4e2b390e
+        wipe: superblock
+      - id: sda-part1_format
+        type: format
+        fstype: ext4
+        label: root
+        uuid: f793b242-e812-44df-91c0-c245a55ffd59
+        volume: sda-part1
+      - id: sda-part1_mount
+        type: mount
+        path: /
+        device: sda-part1_format
diff --git a/helpers/common b/helpers/common
index f9217b7..34f0870 100644
--- a/helpers/common
+++ b/helpers/common
@@ -537,7 +537,44 @@ get_carryover_params() {
         done
         echo "${c# }"
     )
-    _RET="${carry_lead:+${carry_lead} }${carry_extra}"
+    [ -n "${carry_lead}" -a -n "${carry_extra}" ] &&
+        carry_lead="${carry_lead} "
+    _RET="${carry_lead}${carry_extra}"
+}
+
+shell_config_update() {
+    # shell_config_update(file, name, value)
+    # update variable 'name' setting value to 'val' in shell syntax 'file'.
+    # if 'name' is not present, then append declaration.
+    local file="$1" name="$2" val="$3"
+    if ! [ -f "$file" ] || ! grep -q "^$name=" "$file"; then
+        debug 2 "appending to $file shell $name=\"$val\""
+        echo "$name=\"$val\"" >> "$file"
+        return
+    fi
+    local cand="" del=""
+    for cand in "|" "," "/"; do
+        [ "${val#*${del}}" = "${val}" ] && del="$cand" && break
+    done
+    [ -n "$del" ] || {
+        error "Couldn't find a sed delimiter for '$val'";
+        return 1;
+    }
+
+    sed -i -e "s${del}^$name=.*${del}$name=\"$val\"${del}" "$file" ||
+        { error "Failed editing '$file' to set $name=$val"; return 1; }
+    debug 2 "updated $file to set $name=\"$val\""
+    return 0
+}
+
+apply_grub_cmdline_linux_default() {
+    local mp="$1" newargs="$2" edg="${3:-etc/default/grub}"
+    local gcld="GRUB_CMDLINE_LINUX_DEFAULT"
+    debug 1 "setting $gcld to '$newargs' in $edg"
+    shell_config_update "$mp/$edg" "$gcld" "$newargs" || {
+        error "Failed to set '$gcld=$newargs' in $edg"
+        return 1
+    }
 }
 
 install_grub() {
@@ -709,6 +746,8 @@ install_grub() {
     esac
 
     local grub_d="etc/default/grub.d"
+    # ubuntu writes to /etc/default/grub.d/50-curtin-settings.cfg
+    # to avoid tripping prompts on upgrade LP: #564853
     local mygrub_cfg="$grub_d/50-curtin-settings.cfg"
     case $os_family in
         redhat)
@@ -736,9 +775,9 @@ install_grub() {
     # always append rd.auto=1 for centos
     case $os_family in
         redhat)
-            newargs="$newargs rd.auto=1";;
+            newargs="${newargs:+${newargs} }rd.auto=1";;
     esac
-    debug 1 "carryover command line params: $newargs"
+    debug 1 "carryover command line params '$newargs'"
 
     case $os_family in
        debian)
@@ -746,9 +785,15 @@ install_grub() {
             { error "Failed to write '$mygrub_cfg'"; return 1; }
         ;;
     esac
+
+    if [ "${REPLACE_GRUB_LINUX_DEFAULT:-1}" != "0" ]; then
+        apply_grub_cmdline_linux_default "$mp" "$newargs" || {
+            error "Failed to apply grub cmdline."
+            return 1
+        }
+    fi
+
     {
-        [ "${REPLACE_GRUB_LINUX_DEFAULT:-1}" = "0" ] ||
-            echo "GRUB_CMDLINE_LINUX_DEFAULT=\"$newargs\""
         echo "# Curtin disable grub os prober that might find other OS installs."
         echo "GRUB_DISABLE_OS_PROBER=true"
         echo "GRUB_TERMINAL=console"
diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index 58e068b..1268880 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -5,7 +5,9 @@ import imp
 import importlib
 import mock
 import os
+import random
 import shutil
+import string
 import tempfile
 from unittest import TestCase
 
@@ -67,6 +69,11 @@ class CiTestCase(TestCase):
         return os.path.normpath(
             os.path.abspath(os.path.sep.join((_dir, path))))
 
+    def random_string(self, length=8):
+        """ return a random lowercase string with default length of 8"""
+        return ''.join(
+            random.choice(string.ascii_lowercase) for _ in range(length))
+
 
 def dir2dict(startdir, prefix=None):
     flist = {}
diff --git a/tests/unittests/test_apt_custom_sources_list.py b/tests/unittests/test_apt_custom_sources_list.py
index a427ae9..d77c750 100644
--- a/tests/unittests/test_apt_custom_sources_list.py
+++ b/tests/unittests/test_apt_custom_sources_list.py
@@ -94,36 +94,30 @@ class TestAptSourceConfigSourceList(CiTestCase):
         self.new_root = self.tmp_dir()
         # self.patchUtils(self.new_root)
 
-    @staticmethod
-    def _apt_source_list(cfg, expected):
+    def _apt_source_list(self, cfg, expected):
         "_apt_source_list - Test rendering from template (generic)"
 
         arch = util.get_architecture()
         # would fail inside the unittest context
-        with mock.patch.object(util, 'get_architecture',
-                               return_value=arch) as mockga:
-            with mock.patch.object(util, 'write_file') as mockwrite:
-                # keep it side effect free and avoid permission errors
-                with mock.patch.object(os, 'rename'):
-                    # make test independent to executing system
-                    with mock.patch.object(util, 'load_file',
-                                           return_value=MOCKED_APT_SRC_LIST):
-                        with mock.patch.object(distro, 'lsb_release',
-                                               return_value={'codename':
-                                                             'fakerel'}):
-                            apt_config.handle_apt(cfg, TARGET)
-
-        mockga.assert_called_with("/")
-
-        cloudfile = '/etc/cloud/cloud.cfg.d/curtin-preserve-sources.cfg'
-        cloudconf = yaml.dump({'apt_preserve_sources_list': True}, indent=1)
+        bpath = "curtin.commands.apt_config."
+        upath = bpath + "util."
+        self.add_patch(upath + "get_architecture", "mockga", return_value=arch)
+        self.add_patch(upath + "write_file", "mockwrite")
+        self.add_patch(bpath + "os.rename", "mockrename")
+        self.add_patch(upath + "load_file", "mockload_file",
+                       return_value=MOCKED_APT_SRC_LIST)
+        self.add_patch(bpath + "distro.lsb_release", "mock_lsb_release",
+                       return_value={'codename': 'fakerel'})
+        self.add_patch(bpath + "apply_preserve_sources_list",
+                       "mock_apply_preserve_sources_list")
+
+        apt_config.handle_apt(cfg, TARGET)
+
+        self.mockga.assert_called_with(TARGET)
+        self.mock_apply_preserve_sources_list.assert_called_with(TARGET)
         calls = [call(paths.target_path(TARGET, '/etc/apt/sources.list'),
-                      expected,
-                      mode=0o644),
-                 call(paths.target_path(TARGET, cloudfile),
-                      cloudconf,
-                      mode=0o644)]
-        mockwrite.assert_has_calls(calls)
+                      expected, mode=0o644)]
+        self.mockwrite.assert_has_calls(calls)
 
     def test_apt_source_list(self):
         """test_apt_source_list - Test with neither custom sources nor parms"""
@@ -156,10 +150,6 @@ class TestAptSourceConfigSourceList(CiTestCase):
         self.assertEqual(
             EXPECTED_CONVERTED_CONTENT,
             util.load_file(paths.target_path(target, "/etc/apt/sources.list")))
-        cloudfile = paths.target_path(
-            target, '/etc/cloud/cloud.cfg.d/curtin-preserve-sources.cfg')
-        self.assertEqual({'apt_preserve_sources_list': True},
-                         yaml.load(util.load_file(cloudfile)))
 
     @mock.patch("curtin.distro.lsb_release")
     @mock.patch("curtin.util.get_architecture", return_value="amd64")
@@ -224,4 +214,46 @@ class TestAptSourceConfigSourceList(CiTestCase):
         apt_config.handle_apt(cfg, target)
         self.assertEqual(expected, util.load_file(easl))
 
+
+class TestApplyPreserveSourcesList(CiTestCase):
+    """Test apply_preserve_sources_list."""
+
+    cloudfile = "/etc/cloud/cloud.cfg.d/curtin-preserve-sources.cfg"
+
+    def setUp(self):
+        super(TestApplyPreserveSourcesList, self).setUp()
+        self.tmp = self.tmp_dir()
+        self.tmp_cfg = self.tmp_path(self.cloudfile, self.tmp)
+
+    @mock.patch("curtin.commands.apt_config.distro.get_package_version")
+    def test_old_cloudinit_version(self, m_get_pkg_ver):
+        """Test installed old cloud-init version."""
+        m_get_pkg_ver.return_value = distro.parse_dpkg_version('0.7.7-0')
+        apt_config.apply_preserve_sources_list(self.tmp)
+        m_get_pkg_ver.assert_has_calls(
+            [mock.call('cloud-init', target=self.tmp)])
+        self.assertEqual(
+            yaml.load(util.load_file(self.tmp_cfg)),
+            {'apt_preserve_sources_list': True})
+
+    @mock.patch("curtin.commands.apt_config.distro.get_package_version")
+    def test_no_cloudinit(self, m_get_pkg_ver):
+        """Test where cloud-init is not installed."""
+        m_get_pkg_ver.return_value = None
+        apt_config.apply_preserve_sources_list(self.tmp)
+        m_get_pkg_ver.assert_has_calls(
+            [mock.call('cloud-init', target=self.tmp)])
+        self.assertFalse(os.path.exists(self.tmp_cfg))
+
+    @mock.patch("curtin.commands.apt_config.distro.get_package_version")
+    def test_new_cloudinit_version(self, m_get_pkg_ver):
+        """Test cloud-init > 1.0 with new apt format."""
+        m_get_pkg_ver.return_value = distro.parse_dpkg_version('17.1-0ubuntu1')
+        apt_config.apply_preserve_sources_list(self.tmp)
+        m_get_pkg_ver.assert_has_calls(
+            [mock.call('cloud-init', target=self.tmp)])
+        self.assertEqual(
+            yaml.load(util.load_file(self.tmp_cfg)),
+            {'apt': {'preserve_sources_list': True}})
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/unittests/test_commands_block_meta.py b/tests/unittests/test_commands_block_meta.py
index e70d6ed..45b9906 100644
--- a/tests/unittests/test_commands_block_meta.py
+++ b/tests/unittests/test_commands_block_meta.py
@@ -85,8 +85,9 @@ class TestBlockMetaSimple(CiTestCase):
         self.mock_block_get_root_device.assert_called_with([devname],
                                                            paths=paths)
 
+    @patch('curtin.commands.block_meta.meta_clear')
     @patch('curtin.commands.block_meta.write_image_to_disk')
-    def test_meta_simple_calls_write_img(self, mock_write_image):
+    def test_meta_simple_calls_write_img(self, mock_write_image, mock_clear):
         devname = "fakedisk1p1"
         devnode = "/dev/" + devname
         sources = {
@@ -104,9 +105,9 @@ class TestBlockMetaSimple(CiTestCase):
         mock_write_image.return_value = devname
 
         args = Namespace(target=self.target, devices=None, mode=None,
-                         boot_fstype=None, fstype=None)
+                         boot_fstype=None, fstype=None, force_mode=False)
 
-        block_meta.meta_simple(args)
+        block_meta.block_meta(args)
 
         mock_write_image.assert_called_with(sources.get('unittest'), devname)
         self.mock_subp.assert_has_calls(
diff --git a/tests/unittests/test_commands_extract.py b/tests/unittests/test_commands_extract.py
index e604d7f..cc117bb 100644
--- a/tests/unittests/test_commands_extract.py
+++ b/tests/unittests/test_commands_extract.py
@@ -27,8 +27,9 @@ class TestExtractRootFsImageUrl(CiTestCase):
         tmpd = self.tmp_dir()
         target = self.tmp_path("target_d", tmpd)
         startdir = os.getcwd()
+        fname = "my.img"
         try:
-            fname = "my.img"
+            os.chdir(tmpd)
             util.write_file(fname, fname + " data\n")
             extract_root_fsimage_url("file://" + fname, target)
         finally:
diff --git a/tests/unittests/test_make_dname.py b/tests/unittests/test_make_dname.py
index 2b92a88..76c7b28 100644
--- a/tests/unittests/test_make_dname.py
+++ b/tests/unittests/test_make_dname.py
@@ -13,10 +13,16 @@ class TestMakeDname(CiTestCase):
     state = {'scratch': '/tmp/null'}
     rules_d = '/tmp/null/rules.d'
     rule_file = '/tmp/null/rules.d/{}.rules'
+    disk_serial = 'abcdefg'
+    disk_wwn = '0x1234567890'
     storage_config = {
-        'disk1': {'type': 'disk', 'id': 'disk1', 'name': 'main_disk'},
+        'disk1': {'type': 'disk', 'id': 'disk1', 'name': 'main_disk',
+                  'serial': disk_serial},
+        'disk_noid': {'type': 'disk', 'id': 'disk_noid', 'name': 'main_disk'},
         'disk1p1': {'type': 'partition', 'id': 'disk1p1', 'device': 'disk1'},
-        'disk2': {'type': 'disk', 'id': 'disk2',
+        'disk1p2': {'type': 'partition', 'id': 'disk1p2', 'device': 'disk1',
+                    'name': 'custom-partname'},
+        'disk2': {'type': 'disk', 'id': 'disk2', 'wwn': disk_wwn,
                   'name': 'in_valid/name!@#$% &*(+disk'},
         'disk2p1': {'type': 'partition', 'id': 'disk2p1', 'device': 'disk2'},
         'md_id': {'type': 'raid', 'id': 'md_id', 'name': 'mdadm_name'},
@@ -27,7 +33,8 @@ class TestMakeDname(CiTestCase):
         'lpart2_id': {'type': 'lvm_partition', 'id': 'lpart2_id',
                       'name': 'lvm part/2', 'volgroup': 'lvol_id'},
         'bcache1_id': {'type': 'bcache', 'id': 'bcache1_id',
-                       'name': 'my-cached-data'}
+                       'name': 'my-cached-data'},
+        'iscsi1': {'type': 'disk', 'id': 'iscsi1', 'name': 'iscsi_disk1'}
     }
     bcache_super_show = {
         'sb.version': '1 [backing device]',
@@ -57,20 +64,37 @@ class TestMakeDname(CiTestCase):
         rule.append('SYMLINK+="disk/by-dname/{}"\n'.format(target))
         return ', '.join(rule)
 
+    def _content(self, rules=[]):
+        return "\n".join(['# Written by curtin'] + rules)
+
+    @mock.patch('curtin.commands.block_meta.udevadm_info')
     @mock.patch('curtin.commands.block_meta.LOG')
     @mock.patch('curtin.commands.block_meta.get_path_to_storage_volume')
     @mock.patch('curtin.commands.block_meta.util')
-    def test_make_dname_disk(self, mock_util, mock_get_path, mock_log):
+    def test_make_dname_disk(self, mock_util, mock_get_path, mock_log,
+                             mock_udev):
         disk_ptuuid = str(uuid.uuid1())
         mock_util.subp.side_effect = self._make_mock_subp_blkid(
             disk_ptuuid, self.disk_blkid)
         mock_util.load_command_environment.return_value = self.state
-        rule_identifiers = [
-            ('DEVTYPE', 'disk'),
-            ('ID_PART_TABLE_UUID', disk_ptuuid)
-        ]
+
+        rule_identifiers = [('ID_PART_TABLE_UUID', disk_ptuuid)]
+        id_rule_identifiers = [('ID_SERIAL', self.disk_serial)]
+        wwn_rule_identifiers = [('ID_WWN_WITH_EXTENSION', self.disk_wwn)]
+
+        def _drule(devtype, match):
+            return [('DEVTYPE', devtype)] + [m for m in match]
+
+        def drule(match):
+            return _drule('disk', match)
+
+        def prule(match):
+            return _drule('partition', match)
 
         # simple run
+        mock_udev.side_effect = (
+            [{'DEVTYPE': 'disk', 'ID_SERIAL': self.disk_serial},
+             {'DEVTYPE': 'disk', 'ID_WWN_WITH_EXTENSION': self.disk_wwn}])
         res_dname = 'main_disk'
         block_meta.make_dname('disk1', self.storage_config)
         mock_util.ensure_dir.assert_called_with(self.rules_d)
@@ -78,7 +102,13 @@ class TestMakeDname(CiTestCase):
         self.assertFalse(mock_log.warning.called)
         mock_util.write_file.assert_called_with(
             self.rule_file.format(res_dname),
-            self._formatted_rule(rule_identifiers, res_dname))
+            self._content(
+                [self._formatted_rule(drule(rule_identifiers),
+                                      res_dname),
+                 self._formatted_rule(drule(id_rule_identifiers),
+                                      res_dname),
+                 self._formatted_rule(prule(id_rule_identifiers),
+                                      "%s-part%%n" % res_dname)]))
 
         # run invalid dname
         res_dname = 'in_valid-name----------disk'
@@ -86,12 +116,39 @@ class TestMakeDname(CiTestCase):
         self.assertTrue(mock_log.warning.called)
         mock_util.write_file.assert_called_with(
             self.rule_file.format(res_dname),
-            self._formatted_rule(rule_identifiers, res_dname))
+            self._content(
+                [self._formatted_rule(drule(rule_identifiers),
+                                      res_dname),
+                 self._formatted_rule(drule(wwn_rule_identifiers),
+                                      res_dname),
+                 self._formatted_rule(prule(wwn_rule_identifiers),
+                                      "%s-part%%n" % res_dname)]))
 
+        # iscsi disk with no config, but info returns serial and wwn
+        mock_udev.side_effect = (
+            [{'DEVTYPE': 'disk', 'ID_SERIAL': self.disk_serial,
+              'DEVTYPE': 'disk', 'ID_WWN_WITH_EXTENSION': self.disk_wwn}])
+        res_dname = 'iscsi_disk1'
+        block_meta.make_dname('iscsi1', self.storage_config)
+        mock_util.ensure_dir.assert_called_with(self.rules_d)
+        self.assertTrue(mock_log.debug.called)
+        both_rules = (id_rule_identifiers + wwn_rule_identifiers)
+        mock_util.write_file.assert_called_with(
+            self.rule_file.format(res_dname),
+            self._content(
+                [self._formatted_rule(drule(rule_identifiers), res_dname),
+                 self._formatted_rule(drule(both_rules), res_dname),
+                 self._formatted_rule(prule(both_rules),
+                                      "%s-part%%n" % res_dname)]))
+
+    @mock.patch('curtin.commands.block_meta.udevadm_info')
     @mock.patch('curtin.commands.block_meta.LOG')
     @mock.patch('curtin.commands.block_meta.get_path_to_storage_volume')
     @mock.patch('curtin.commands.block_meta.util')
-    def test_make_dname_failures(self, mock_util, mock_get_path, mock_log):
+    def test_make_dname_failures(self, mock_util, mock_get_path, mock_log,
+                                 mock_udev):
+        mock_udev.side_effect = ([{'DEVTYPE': 'disk'}, {'DEVTYPE': 'disk'}])
+
         mock_util.subp.side_effect = self._make_mock_subp_blkid(
             '', self.trusty_blkid)
         mock_util.load_command_environment.return_value = self.state
@@ -99,10 +156,14 @@ class TestMakeDname(CiTestCase):
         warning_msg = "Can't find a uuid for volume: {}. Skipping dname."
 
         # disk with no PT_UUID
-        block_meta.make_dname('disk1', self.storage_config)
-        mock_log.warning.assert_called_with(warning_msg.format('disk1'))
-        self.assertFalse(mock_util.write_file.called)
+        disk = 'disk_noid'
+        with self.assertRaises(RuntimeError):
+            block_meta.make_dname(disk, self.storage_config)
+            mock_log.warning.assert_called_with(warning_msg.format(disk))
+            self.assertFalse(mock_util.write_file.called)
 
+        mock_util.subp.side_effect = self._make_mock_subp_blkid(
+            '', self.trusty_blkid)
         # partition with no PART_UUID
         block_meta.make_dname('disk1p1', self.storage_config)
         mock_log.warning.assert_called_with(warning_msg.format('disk1p1'))
@@ -123,22 +184,15 @@ class TestMakeDname(CiTestCase):
         ]
 
         # simple run
-        res_dname = 'main_disk-part1'
-        block_meta.make_dname('disk1p1', self.storage_config)
+        res_dname = 'custom-partname'
+        block_meta.make_dname('disk1p2', self.storage_config)
         mock_util.ensure_dir.assert_called_with(self.rules_d)
         self.assertTrue(mock_log.debug.called)
         self.assertFalse(mock_log.warning.called)
         mock_util.write_file.assert_called_with(
             self.rule_file.format(res_dname),
-            self._formatted_rule(rule_identifiers, res_dname))
-
-        # run invalid dname
-        res_dname = 'in_valid-name----------disk-part1'
-        block_meta.make_dname('disk2p1', self.storage_config)
-        self.assertTrue(mock_log.warning.called)
-        mock_util.write_file.assert_called_with(
-            self.rule_file.format(res_dname),
-            self._formatted_rule(rule_identifiers, res_dname))
+            self._content(
+                [self._formatted_rule(rule_identifiers, res_dname)]))
 
     @mock.patch('curtin.commands.block_meta.mdadm')
     @mock.patch('curtin.commands.block_meta.LOG')
@@ -158,7 +212,8 @@ class TestMakeDname(CiTestCase):
         self.assertFalse(mock_log.warning.called)
         mock_util.write_file.assert_called_with(
             self.rule_file.format(res_dname),
-            self._formatted_rule(rule_identifiers, res_dname))
+            self._content(
+                [self._formatted_rule(rule_identifiers, res_dname)]))
 
         # invalid name
         res_dname = 'mdadm-name'
@@ -166,7 +221,8 @@ class TestMakeDname(CiTestCase):
         self.assertTrue(mock_log.warning.called)
         mock_util.write_file.assert_called_with(
             self.rule_file.format(res_dname),
-            self._formatted_rule(rule_identifiers, res_dname))
+            self._content(
+                [self._formatted_rule(rule_identifiers, res_dname)]))
 
     @mock.patch('curtin.commands.block_meta.LOG')
     @mock.patch('curtin.commands.block_meta.get_path_to_storage_volume')
@@ -183,7 +239,8 @@ class TestMakeDname(CiTestCase):
         self.assertFalse(mock_log.warning.called)
         mock_util.write_file.assert_called_with(
             self.rule_file.format(res_dname),
-            self._formatted_rule(rule_identifiers, res_dname))
+            self._content(
+                [self._formatted_rule(rule_identifiers, res_dname)]))
 
         # with invalid name
         res_dname = 'vg1-lvm-part-2'
@@ -192,7 +249,8 @@ class TestMakeDname(CiTestCase):
         self.assertTrue(mock_log.warning.called)
         mock_util.write_file.assert_called_with(
             self.rule_file.format(res_dname),
-            self._formatted_rule(rule_identifiers, res_dname))
+            self._content(
+                [self._formatted_rule(rule_identifiers, res_dname)]))
 
     @mock.patch('curtin.commands.block_meta.LOG')
     @mock.patch('curtin.commands.block_meta.bcache')
@@ -213,7 +271,8 @@ class TestMakeDname(CiTestCase):
         self.assertFalse(mock_log.warning.called)
         mock_util.write_file.assert_called_with(
             self.rule_file.format(res_dname),
-            self._formatted_rule(rule_identifiers, res_dname))
+            self._content(
+                [self._formatted_rule(rule_identifiers, res_dname)]))
 
     def test_sanitize_dname(self):
         unsanitized_to_sanitized = [
@@ -226,4 +285,87 @@ class TestMakeDname(CiTestCase):
         for (unsanitized, sanitized) in unsanitized_to_sanitized:
             self.assertEqual(block_meta.sanitize_dname(unsanitized), sanitized)
 
+
+class TestMakeDnameById(CiTestCase):
+
+    @mock.patch('curtin.commands.block_meta.udevadm_info')
+    def test_bad_path(self, m_udev):
+        """test dname_byid raises ValueError on invalid path."""
+        mypath = None
+        with self.assertRaises(ValueError):
+            block_meta.make_dname_byid(mypath)
+
+    @mock.patch('curtin.commands.block_meta.udevadm_info')
+    def test_non_disk(self, m_udev):
+        """test dname_byid raises ValueError on DEVTYPE != 'disk'"""
+        mypath = "/dev/" + self.random_string()
+        m_udev.return_value = {'DEVTYPE': 'not_a_disk'}
+        with self.assertRaises(ValueError):
+            block_meta.make_dname_byid(mypath)
+
+    @mock.patch('curtin.commands.block_meta.udevadm_info')
+    def test_disk_with_no_id_wwn(self, m_udev):
+        """test dname_byid raises RuntimeError on device without ID or WWN."""
+        mypath = "/dev/" + self.random_string()
+        m_udev.return_value = {'DEVTYPE': 'disk'}
+        with self.assertRaises(RuntimeError):
+            block_meta.make_dname_byid(mypath)
+
+    @mock.patch('curtin.commands.block_meta.udevadm_info')
+    def test_udevinfo_not_called_if_info_provided(self, m_udev):
+        """dname_byid does not invoke udevadm_info if using info dict"""
+        myserial = self.random_string()
+        self.assertEqual(
+            [['ENV{ID_SERIAL}=="%s"' % myserial]],
+            block_meta.make_dname_byid(
+                self.random_string(),
+                info={'DEVTYPE': 'disk', 'ID_SERIAL': myserial}))
+        self.assertEqual(0, m_udev.call_count)
+
+    @mock.patch('curtin.commands.block_meta.udevadm_info')
+    def test_udevinfo_called_if_info_not_provided(self, m_udev):
+        """dname_byid should call udevadm_info if no data given."""
+        myserial = self.random_string()
+        mypath = "/dev/" + self.random_string()
+        m_udev.return_value = {
+            'DEVTYPE': 'disk', 'ID_SERIAL': myserial, 'DEVNAME': mypath}
+        self.assertEqual(
+            [['ENV{ID_SERIAL}=="%s"' % myserial]],
+            block_meta.make_dname_byid(mypath))
+        self.assertEqual(
+            [mock.call(path=mypath)], m_udev.call_args_list)
+
+    def test_disk_with_only_serial(self):
+        """test dname_byid returns rules for ID_SERIAL"""
+        mypath = "/dev/" + self.random_string()
+        myserial = self.random_string()
+        info = {'DEVTYPE': 'disk', 'DEVNAME': mypath, 'ID_SERIAL': myserial}
+        self.assertEqual(
+            [['ENV{ID_SERIAL}=="%s"' % myserial]],
+            block_meta.make_dname_byid(mypath, info=info))
+
+    def test_disk_with_only_wwn(self):
+        """test dname_byid returns rules for ID_WWN_WITH_EXTENSION"""
+        mypath = "/dev/" + self.random_string()
+        mywwn = self.random_string()
+        info = {'DEVTYPE': 'disk', 'DEVNAME': mypath,
+                'ID_WWN_WITH_EXTENSION': mywwn}
+        self.assertEqual(
+            [['ENV{ID_WWN_WITH_EXTENSION}=="%s"' % mywwn]],
+            block_meta.make_dname_byid(mypath, info=info))
+
+    def test_disk_with_both_id_wwn(self):
+        """test dname_byid returns rules with both ID_SERIAL and ID_WWN"""
+        mypath = "/dev/" + self.random_string()
+        myserial = self.random_string()
+        mywwn = self.random_string()
+        info = {'DEVTYPE': 'disk', 'ID_SERIAL': myserial,
+                'ID_WWN_WITH_EXTENSION': mywwn,
+                'DEVNAME': mypath}
+        self.assertEqual(
+            [['ENV{ID_SERIAL}=="%s"' % myserial,
+              'ENV{ID_WWN_WITH_EXTENSION}=="%s"' % mywwn]],
+            block_meta.make_dname_byid(mypath, info=info))
+
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/unittests/test_swap.py b/tests/unittests/test_swap.py
index e12d12e..fd6c527 100644
--- a/tests/unittests/test_swap.py
+++ b/tests/unittests/test_swap.py
@@ -1,39 +1,53 @@
 import mock
 
 from curtin import swap
+from curtin import util
 from .helpers import CiTestCase
 
 
 class TestSwap(CiTestCase):
-    @mock.patch('curtin.swap.resource')
-    @mock.patch('curtin.swap.util')
-    def test_is_swap_device_read_offsets(self, mock_util, mock_resource):
-        """swap.is_swap_device() checks offsets based on system pagesize"""
-        path = '/mydev/dummydisk'
+    def _valid_swap_contents(self):
+        """Yields (pagesize, content) of things that should be considered
+           valid swap."""
         # 4k and 64k page size
         for pagesize in [4096, 65536]:
-            magic_offset = pagesize - 10
-            mock_resource.getpagesize.return_value = pagesize
-            swap.is_swap_device(path)
-            mock_util.load_file.assert_called_with(path, read_len=10,
-                                                   offset=magic_offset,
-                                                   decode=False)
+            for magic in [b'SWAPSPACE2', b'SWAP-SPACE']:
+                # yield content of 2 pages to trigger/avoid fence-post errors
+                yield (pagesize,
+                       ((pagesize - len(magic)) * b'\0' +
+                        magic + pagesize * b'\0'))
 
-    @mock.patch('curtin.swap.resource')
-    @mock.patch('curtin.swap.util')
-    def test_identify_swap_false(self, mock_util, mock_resource):
-        """swap.is_swap_device() returns false on non swap magic"""
-        mock_util.load_file.return_value = (
-            b'\x00\x00c\x05\x00\x00\x11\x00\x19\x00')
-        is_swap = swap.is_swap_device('ignored')
-        self.assertFalse(is_swap)
+    @mock.patch('curtin.swap.resource.getpagesize')
+    def test_is_swap_device_read_offsets(self, mock_getpagesize):
+        """swap.is_swap_device() correctly identifies swap content."""
+        tmpd = self.tmp_dir()
+        for num, (pagesize, content) in enumerate(self._valid_swap_contents()):
+            path = self.tmp_path("swap-file-%02d" % num, tmpd)
+            util.write_file(path, content, omode="wb")
+            mock_getpagesize.return_value = pagesize
+            self.assertTrue(swap.is_swap_device(path))
 
-    @mock.patch('curtin.swap.resource')
-    @mock.patch('curtin.swap.util')
-    def test_identify_swap_true(self, mock_util, mock_resource):
-        """swap.is_swap_device() returns true on swap magic strings"""
-        path = '/mydev/dummydisk'
-        for magic in [b'SWAPSPACE2', b'SWAP-SPACE']:
-            mock_util.load_file.return_value = magic
-            is_swap = swap.is_swap_device(path)
-            self.assertTrue(is_swap)
+    @mock.patch('curtin.swap.resource.getpagesize', return_value=4096)
+    def test_identify_swap_false_if_tiny(self, mock_getpagesize):
+        """small files do not trip up is_swap_device()."""
+        path = self.tmp_path("tiny")
+        util.write_file(path, b'tinystuff', omode='wb')
+        self.assertFalse(swap.is_swap_device(path))
+
+    @mock.patch('curtin.swap.resource.getpagesize', return_value=4096)
+    def test_identify_zeros_are_swap(self, mock_getpagesize):
+        """swap.is_swap_device() returns false on all zeros"""
+        pagesize = mock_getpagesize()
+        path = self.tmp_path("notswap0")
+        util.write_file(path, pagesize * 2 * b'\0', omode="wb")
+        self.assertFalse(swap.is_swap_device(path))
+
+    @mock.patch('curtin.swap.resource.getpagesize', return_value=65536)
+    def test_identify_swap_false(self, mock_getpagesize):
+        """swap.is_swap_device() returns false on non swap content"""
+        pagesize = mock_getpagesize()
+        path = self.tmp_path("notswap1")
+        # this is just arbitrary content that is not swap content.
+        blob = b'\x00\x00c\x05\x00\x00\x11\x19'
+        util.write_file(path, int(pagesize * 2 / len(blob)) * blob, omode="wb")
+        self.assertFalse(swap.is_swap_device(path))
diff --git a/tests/unittests/test_udev.py b/tests/unittests/test_udev.py
 new file mode 100644
index 0000000..0a070d5
--- /dev/null
+++ b/tests/unittests/test_udev.py
@@ -0,0 +1,68 @@
+# This file is part of curtin. See LICENSE file for copyright and license info.
+
+import mock
+
+from curtin import udev
+from curtin import util
+from .helpers import CiTestCase
+
+
+UDEVADM_INFO_QUERY = """\
+DEVLINKS=/dev/disk/by-id/nvme-eui.0025388b710116a1
+DEVNAME=/dev/nvme0n1
+DEVPATH=/devices/pci0000:00/0000:00:1c.4/0000:05:00.0/nvme/nvme0/nvme0n1
+DEVTYPE=disk
+ID_PART_TABLE_TYPE=gpt
+ID_PART_TABLE_UUID=ea0b9ddc-a114-4e01-b257-750d86e3a944
+ID_SERIAL=SAMSUNG MZVLB1T0HALR-000L7_S3TPNY0JB00151
+ID_SERIAL_SHORT=S3TPNY0JB00151
+MAJOR=259
+MINOR=0
+SUBSYSTEM=block
+TAGS=:systemd:
+USEC_INITIALIZED=2026691
+"""
+
+INFO_DICT = {
+    'DEVLINKS': ['/dev/disk/by-id/nvme-eui.0025388b710116a1'],
+    'DEVNAME': '/dev/nvme0n1',
+    'DEVPATH':
+        '/devices/pci0000:00/0000:00:1c.4/0000:05:00.0/nvme/nvme0/nvme0n1',
+    'DEVTYPE': 'disk',
+    'ID_PART_TABLE_TYPE': 'gpt',
+    'ID_PART_TABLE_UUID': 'ea0b9ddc-a114-4e01-b257-750d86e3a944',
+    'ID_SERIAL': 'SAMSUNG MZVLB1T0HALR-000L7_S3TPNY0JB00151',
+    'ID_SERIAL_SHORT': 'S3TPNY0JB00151',
+    'MAJOR': '259',
+    'MINOR': '0',
+    'SUBSYSTEM': 'block',
+    'TAGS': ':systemd:',
+    'USEC_INITIALIZED': '2026691'
+}
+
+
+class TestUdevInfo(CiTestCase):
+
+    @mock.patch('curtin.util.subp')
+    def test_udevadm_info(self, m_subp):
+        """ udevadm_info returns dictionary for specified device """
+        mypath = '/dev/nvme0n1'
+        m_subp.return_value = (UDEVADM_INFO_QUERY, "")
+        info = udev.udevadm_info(mypath)
+        m_subp.assert_called_with(
+            ['udevadm', 'info', '--query=property', mypath], capture=True)
+        self.assertEqual(sorted(INFO_DICT), sorted(info))
+
+    def test_udevadm_info_no_path(self):
+        """ udevadm_info raises ValueError for invalid path value"""
+        mypath = None
+        with self.assertRaises(ValueError):
+            udev.udevadm_info(mypath)
+
+    @mock.patch('curtin.util.subp')
+    def test_udevadm_info_path_not_exists(self, m_subp):
+        """ udevadm_info raises ProcessExecutionError for invalid path value"""
+        mypath = self.random_string()
+        m_subp.side_effect = util.ProcessExecutionError()
+        with self.assertRaises(util.ProcessExecutionError):
+            udev.udevadm_info(mypath)
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 3823e39..bc4a87b 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -21,6 +21,7 @@ from curtin.block import iscsi
 
 from .report_webhook_logger import CaptureReporting
 from curtin.commands.install import INSTALL_PASS_MSG
+from curtin.commands.block_meta import sanitize_dname
 
 from .image_sync import query as imagesync_query
 from .image_sync import mirror as imagesync_mirror
@@ -344,12 +345,17 @@ class TempDir(object):
 
     def collect_output(self):
         logger.debug('extracting output disk')
-        subprocess.check_call(['tar', '-C', self.collect, '-xf',
-                               self.output_disk],
-                              stdout=DEVNULL, stderr=subprocess.STDOUT)
-        # make sure collect output dir is usable by non-root
-        subprocess.check_call(['chmod', '-R', 'u+rwX', self.collect],
-                              stdout=DEVNULL, stderr=subprocess.STDOUT)
+        try:
+            subprocess.check_call(['tar', '-C', self.collect, '-xf',
+                                   self.output_disk],
+                                  stdout=DEVNULL, stderr=subprocess.STDOUT)
+        except subprocess.CalledProcessError as e:
+            logger.error('Failed unpacking collect output: %s', e)
+        finally:
+            logger.debug('Fixing collect output dir permissions.')
+            # make sure collect output dir is usable by non-root
+            subprocess.check_call(['chmod', '-R', 'u+rwX', self.collect],
+                                  stdout=DEVNULL, stderr=subprocess.STDOUT)
 
 
 def skip_if_flag(flag):
@@ -515,11 +521,17 @@ DEFAULT_COLLECT_SCRIPTS = {
         ls -al /dev/disk/by-dname/ | cat >ls_al_bydname
         ls -al /dev/disk/by-id/ | cat >ls_al_byid
         ls -al /dev/disk/by-uuid/ | cat >ls_al_byuuid
+        ls -al /dev/disk/by-partuuid/ | cat >ls_al_bypartuuid
         blkid -o export | cat >blkid.out
         find /boot | cat > find_boot.out
-        [ -e /sys/firmware/efi ] && {
+        if [ -e /sys/firmware/efi ]; then
             efibootmgr -v | cat >efibootmgr.out;
-        }
+        fi
+        [ ! -d /etc/default/grub.d ] ||
+            cp -a /etc/default/grub.d etc_default_grub_d
+        [ ! -f /etc/default/grub ] || cp /etc/default/grub etc_default_grub
+
+        exit 0
         """)],
     'centos': [textwrap.dedent("""
         # XXX: command | cat >output is required for Centos under SELinux
@@ -530,6 +542,8 @@ DEFAULT_COLLECT_SCRIPTS = {
         rpm -q --queryformat '%{VERSION}\n' cloud-init |tee rpm_ci_version
         rpm -E '%rhel' > rpm_dist_version_major
         cp -a /etc/centos-release .
+
+        exit 0
         """)],
     'ubuntu': [textwrap.dedent("""
         cd OUTPUT_COLLECT_D
@@ -543,6 +557,8 @@ DEFAULT_COLLECT_SCRIPTS = {
         out=$(apt-config shell v Acquire::HTTP::Proxy)
         eval "$out"
         echo "$v" > apt-proxy
+
+        exit 0
         """)]
 }
 
@@ -890,6 +906,11 @@ class VMBaseClass(TestCase):
             "--append=ro",
         ])
 
+        # Avoid LP: #1797218 and make vms boot faster
+        cmd.extend(['--append=%s' % service for service in
+                    ["systemd.mask=snapd.seeded.service",
+                     "systemd.mask=snapd.service"]])
+
         # getting resolvconf configured is only fixed in bionic
         # the iscsi_auto handles resolvconf setup via call to
         # configure_networking in initramfs
@@ -935,13 +956,21 @@ class VMBaseClass(TestCase):
 
         # build disk arguments
         disks = []
-        sc = cls.load_conf_file()
-        storage_config = yaml.load(sc).get('storage', {}).get('config', {})
+        storage_config = cls.get_class_storage_config()
         cls.disk_wwns = ["wwn=%s" % x.get('wwn') for x in storage_config
                          if 'wwn' in x]
-        cls.disk_serials = ["serial=%s" % x.get('serial')
-                            for x in storage_config if 'serial' in x]
+        cls.disk_serials = []
+        cls.nvme_serials = []
+        for x in storage_config:
+            if 'serial' in x:
+                serial = x.get('serial')
+                if serial.startswith('nvme'):
+                    cls.nvme_serials.append("serial=%s" % serial)
+                else:
+                    cls.disk_serials.append("serial=%s" % serial)
 
+        logger.info("disk_serials: %s", cls.disk_serials)
+        logger.info("nvme_serials: %s", cls.nvme_serials)
         target_disk = "{}:{}:{}:{}:".format(cls.td.target_disk,
                                             "",
                                             cls.disk_driver,
@@ -973,11 +1002,13 @@ class VMBaseClass(TestCase):
             disks.extend(['--disk', extra_disk])
 
         # build nvme disk args if needed
+        logger.info('nvme disks: %s', cls.nvme_disks)
         for (disk_no, disk_sz) in enumerate(cls.nvme_disks):
             dpath = os.path.join(cls.td.disks, 'nvme_disk_%d.img' % disk_no)
+            nvme_serial = cls.nvme_serials[disk_no]
             nvme_disk = '{}:{}:nvme:{}:{}'.format(dpath, disk_sz,
                                                   cls.disk_block_size,
-                                                  "serial=nvme-%d" % disk_no)
+                                                  "%s" % nvme_serial)
             disks.extend(['--disk', nvme_disk])
 
         # build iscsi disk args if needed
@@ -1206,6 +1237,8 @@ class VMBaseClass(TestCase):
             dpath = os.path.join(cls.td.disks, 'nvme_disk_%d.img' % disk_no)
             disk = '--disk={},driver={},format={},{}'.format(
                 dpath, disk_driver, TARGET_IMAGE_FORMAT, bsize_args)
+            if len(cls.nvme_serials):
+                disk += ",%s" % cls.nvme_serials[disk_no]
             nvme_disks.extend([disk])
 
         # unlike NVMe disks, we do not want to configure the iSCSI disks
@@ -1525,8 +1558,41 @@ class VMBaseClass(TestCase):
         for diskname, part in self.disk_to_check:
             if part is not 0:
                 link = diskname + "-part" + str(part)
-                self.assertIn(link, contents)
-            self.assertIn(diskname, contents)
+                self.assertIn(link, contents.splitlines())
+            self.assertIn(diskname, contents.splitlines())
+
+    @skip_if_flag('expected_failure')
+    def test_dname_rules(self, disk_to_check=None):
+        if self.target_distro != "ubuntu":
+            raise SkipTest("dname not present in non-ubuntu releases")
+
+        if not disk_to_check:
+            disk_to_check = self.disk_to_check
+        if disk_to_check is None:
+            logger.debug('test_dname_rules: no disks to check')
+            return
+        logger.debug('test_dname_rules: checking disks: %s', disk_to_check)
+        self.output_files_exist(["udev_rules.d"])
+
+        cfg = yaml.load(self.load_collect_file("root/curtin-install-cfg.yaml"))
+        stgcfg = cfg.get("storage", {}).get("config", [])
+        disks = [ent for ent in stgcfg if (ent.get('type') == 'disk' and
+                                           'name' in ent)]
+        key_to_udev = {
+            'serial': 'ID_SERIAL',
+            'wwn': 'ID_WWN_WITH_EXTENSION',
+        }
+        for disk in disks:
+            dname_file = "%s.rules" % sanitize_dname(disk.get('name'))
+            contents = self.load_collect_file("udev_rules.d/%s" % dname_file)
+            for key, key_name in key_to_udev.items():
+                value = disk.get(key)
+                if value:
+                    # serials may include spaces, udev replaces them with # _
+                    if ' ' in value:
+                        value = value.replace(' ', '_')
+                    self.assertIn(key_name, contents)
+                    self.assertIn(value, contents)
 
     @skip_if_flag('expected_failure')
     def test_reporting_data(self):
@@ -1570,6 +1636,29 @@ class VMBaseClass(TestCase):
         kpackage = self.get_kernel_package()
         self.assertIn(kpackage, self.debian_packages)
 
+    @skip_if_flag('expected_failure')
+    def test_clear_holders_ran(self):
+        """ Test curtin install runs block-meta/clear-holders. """
+        if not self.has_storage_config():
+            raise SkipTest("This test does not use storage config.")
+
+        install_logfile = 'root/curtin-install.log'
+        self.output_files_exist([install_logfile])
+        install_log = self.load_collect_file(install_logfile)
+
+        # validate block-meta called clear-holders at least once
+        # We match both 'start' and 'finish' strings, so for each
+        # call we'll have 2 matches.
+        clear_holders_re = 'cmd-install/.*cmd-block-meta/clear-holders'
+        events = re.findall(clear_holders_re, install_log)
+        print('Matched clear-holder events:\n%s' % events)
+        self.assertGreaterEqual(len(events), 2)
+
+        # dirty_disks mode runs an early block-meta command which
+        # also runs clear-holders
+        if self.dirty_disks is True:
+            self.assertGreaterEqual(len(events), 4)
+
     def run(self, result):
         super(VMBaseClass, self).run(result)
         self.record_result(result)
@@ -1609,14 +1698,25 @@ class VMBaseClass(TestCase):
             self._debian_packages = pkgs
         return self._debian_packages
 
+    @classmethod
+    def get_class_storage_config(cls):
+        sc = cls.load_conf_file()
+        return yaml.load(sc).get('storage', {}).get('config', {})
+
+    def get_storage_config(self):
+        cfg = yaml.load(self.load_collect_file("root/curtin-install-cfg.yaml"))
+        return cfg.get("storage", {}).get("config", [])
+
+    def has_storage_config(self):
+        '''check if test used storage config'''
+        return len(self.get_storage_config()) > 0
+
     @skip_if_flag('expected_failure')
     def test_swaps_used(self):
-        cfg = yaml.load(self.load_collect_file("root/curtin-install-cfg.yaml"))
-        stgcfg = cfg.get("storage", {}).get("config", [])
-        if len(stgcfg) == 0:
-            logger.debug("This test does not use storage config.")
-            return
+        if not self.has_storage_config():
+            raise SkipTest("This test does not use storage config.")
 
+        stgcfg = self.get_storage_config()
         swap_ids = [d["id"] for d in stgcfg if d.get("fstype") == "swap"]
         swap_mounts = [d for d in stgcfg if d.get("device") in swap_ids]
         self.assertEqual(len(swap_ids), len(swap_mounts),
@@ -1715,6 +1815,9 @@ class PsuedoVMBaseClass(VMBaseClass):
     def test_dname(self, disk_to_check=None):
         pass
 
+    def test_dname_rules(self, disk_to_check=None):
+        pass
+
     def test_interfacesd_eth0_removed(self):
         pass
 
@@ -1772,6 +1875,7 @@ def check_install_log(install_log, nrchars=200):
     install_fail = "({})".format("|".join([
                    'Installation failed',
                    'ImportError: No module named.*',
+                   'Out of memory:',
                    'Unexpected error while running command',
                    'E: Unable to locate package.*',
                    'cloud-init.*: Traceback.*']))
diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py
index 7be8feb..5dfb2d2 100644
--- a/tests/vmtests/releases.py
+++ b/tests/vmtests/releases.py
@@ -113,6 +113,11 @@ class _CosmicBase(_UbuntuBase):
     target_release = "cosmic"
 
 
+class _DiscoBase(_UbuntuBase):
+    release = "disco"
+    target_release = "disco"
+
+
 class _Releases(object):
     trusty = _TrustyBase
     precise = _PreciseBase
@@ -128,6 +133,7 @@ class _Releases(object):
     xenial_edge = _XenialEdge
     bionic = _BionicBase
     cosmic = _CosmicBase
+    disco = _DiscoBase
 
 
 class _CentosReleases(object):
diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py
index f9b6a09..1296240 100644
--- a/tests/vmtests/test_apt_config_cmd.py
+++ b/tests/vmtests/test_apt_config_cmd.py
@@ -5,6 +5,7 @@
     apt-config standalone command.
 """
 import textwrap
+import yaml
 
 from . import VMBaseClass
 from .releases import base_vm_classes as relbase
@@ -23,6 +24,8 @@ class TestAptConfigCMD(VMBaseClass):
         cp /etc/apt/sources.list.d/curtin-dev-ubuntu-test-archive-*.list .
         cp /etc/cloud/cloud.cfg.d/curtin-preserve-sources.cfg .
         apt-cache policy | grep proposed > proposed-enabled
+
+        exit 0
         """)]
 
     def test_cmd_proposed_enabled(self):
@@ -44,8 +47,10 @@ class TestAptConfigCMD(VMBaseClass):
     def test_cmd_preserve_source(self):
         """check if cloud-init was prevented from overwriting"""
         self.output_files_exist(["curtin-preserve-sources.cfg"])
-        self.check_file_regex("curtin-preserve-sources.cfg",
-                              "apt_preserve_sources_list.*true")
+        # For earlier than xenial 'apt_preserve_sources_list' is expected
+        self.assertEqual(
+            {'apt': {'preserve_sources_list': True}},
+            yaml.load(self.load_collect_file("curtin-preserve-sources.cfg")))
 
 
 class XenialTestAptConfigCMDCMD(relbase.xenial, TestAptConfigCMD):
@@ -62,4 +67,8 @@ class BionicTestAptConfigCMDCMD(relbase.bionic, TestAptConfigCMD):
 class CosmicTestAptConfigCMDCMD(relbase.cosmic, TestAptConfigCMD):
     __test__ = True
 
+
+class DiscoTestAptConfigCMDCMD(relbase.disco, TestAptConfigCMD):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_apt_source.py b/tests/vmtests/test_apt_source.py
index bb502b2..2cd7267 100644
--- a/tests/vmtests/test_apt_source.py
+++ b/tests/vmtests/test_apt_source.py
@@ -4,6 +4,7 @@
     Collection of tests for the apt configuration features
 """
 import textwrap
+import yaml
 
 from . import VMBaseClass
 from .releases import base_vm_classes as relbase
@@ -34,6 +35,8 @@ class TestAptSrcAbs(VMBaseClass):
         apt-config dump | grep Retries > aptconf
         cp /etc/apt/sources.list sources.list
         cp /etc/cloud/cloud.cfg.d/curtin-preserve-sources.cfg .
+
+        exit 0
         """)]
     mirror = "http://us.archive.ubuntu.com/ubuntu"
     secmirror = "http://security.ubuntu.com/ubuntu"
@@ -61,8 +64,10 @@ class TestAptSrcAbs(VMBaseClass):
     def test_preserve_source(self):
         """test_preserve_source - no clobbering sources.list by cloud-init"""
         self.output_files_exist(["curtin-preserve-sources.cfg"])
-        self.check_file_regex("curtin-preserve-sources.cfg",
-                              "apt_preserve_sources_list.*true")
+        # For earlier than xenial 'apt_preserve_sources_list' is expected
+        self.assertEqual(
+            {'apt': {'preserve_sources_list': True}},
+            yaml.load(self.load_collect_file("curtin-preserve-sources.cfg")))
 
     def test_source_files(self):
         """test_source_files - Check generated .lists for correct content"""
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index 54e3df8..48f07d6 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -17,9 +17,14 @@ class TestBasicAbs(VMBaseClass):
     dirty_disks = True
     conf_file = "examples/tests/basic.yaml"
     extra_disks = ['128G', '128G', '4G']
-    nvme_disks = ['4G']
-    disk_to_check = [('main_disk_with_in---valid--dname', 1),
-                     ('main_disk_with_in---valid--dname', 2)]
+    disk_to_check = [('btrfs_volume', 0),
+                     ('main_disk_with_in---valid--dname', 0),
+                     ('main_disk_with_in---valid--dname', 1),
+                     ('main_disk_with_in---valid--dname', 2),
+                     ('pnum_disk', 0),
+                     ('pnum_disk', 1),
+                     ('pnum_disk', 10),
+                     ('sparedisk', 0)]
     extra_collect_scripts = [textwrap.dedent("""
         cd OUTPUT_COLLECT_D
         blkid -o export /dev/vda | cat >blkid_output_vda
@@ -32,6 +37,13 @@ class TestBasicAbs(VMBaseClass):
            btrfs inspect-internal dump-super $dev |
                awk '/^dev_item.fsid/ {print $2}'
         fi | cat >$f
+
+        # compare via /dev/zero 8MB
+        cmp --bytes=8388608 /dev/zero /dev/vde2; echo "$?" > cmp_prep.out
+        # extract partition info
+        udevadm info --export --query=property /dev/vde2 | cat >udev_info.out
+
+        exit 0
         """)]
 
     def _kname_to_uuid(self, kname):
@@ -108,6 +120,21 @@ class TestBasicAbs(VMBaseClass):
         # compare them
         self.assertEqual(kname_uuid, btrfs_uuid)
 
+    def _test_partition_is_prep(self, info_file):
+        udev_info = self.load_collect_file(info_file).rstrip()
+        entry_type = ''
+        for line in udev_info.splitlines():
+            if line.startswith('ID_PART_ENTRY_TYPE'):
+                entry_type = line.split("=", 1)[1].replace("'", "")
+                break
+        # https://en.wikipedia.org/wiki/GUID_Partition_Table
+        # GPT PReP boot UUID
+        self.assertEqual('9e1a2d38-c612-4316-aa26-8b49521e5a8b'.lower(),
+                         entry_type.lower())
+
+    def _test_partition_is_zero(self, cmp_file):
+        self.assertEqual(0, int(self.load_collect_file(cmp_file).rstrip()))
+
     # class specific input
     def test_output_files_exist(self):
         self.output_files_exist(
@@ -118,9 +145,9 @@ class TestBasicAbs(VMBaseClass):
         self._test_ptable("blkid_output_vda", "dos")
 
     def test_partition_numbers(self):
-        # vde should have partitions 1 and 10
+        # vde should have partitions 1 2, and 10
         disk = "vde"
-        expected = [disk + s for s in ["", "1", "10"]]
+        expected = [disk + s for s in ["", "1", "2", "10"]]
         self._test_partition_numbers(disk, expected)
 
     def test_fstab_entries(self):
@@ -157,6 +184,12 @@ class TestBasicAbs(VMBaseClass):
         print('Source repo version: %s' % source_version)
         self.assertEqual(source_version, installed_version)
 
+    def test_partition_is_prep(self):
+        self._test_partition_is_prep("udev_info.out")
+
+    def test_partition_is_zero(self):
+        self._test_partition_is_zero("cmp_prep.out")
+
 
 class CentosTestBasicAbs(TestBasicAbs):
     def test_centos_release(self):
@@ -213,11 +246,14 @@ class CosmicTestBasic(relbase.cosmic, TestBasicAbs):
     __test__ = True
 
 
+class DiscoTestBasic(relbase.disco, TestBasicAbs):
+    __test__ = True
+
+
 class TestBasicScsiAbs(TestBasicAbs):
     conf_file = "examples/tests/basic_scsi.yaml"
     disk_driver = 'scsi-hd'
     extra_disks = ['128G', '128G', '4G']
-    nvme_disks = ['4G']
     extra_collect_scripts = [textwrap.dedent("""
         cd OUTPUT_COLLECT_D
         blkid -o export /dev/sda | cat >blkid_output_sda
@@ -230,15 +266,22 @@ class TestBasicScsiAbs(TestBasicAbs):
            btrfs inspect-internal dump-super $dev |
                awk '/^dev_item.fsid/ {print $2}'
         fi | cat >$f
+
+        # compare via /dev/zero 8MB
+        cmp --bytes=8388608 /dev/zero /dev/sdd2; echo "$?" > cmp_prep.out
+        # extract partition info
+        udevadm info --export --query=property /dev/sdd2 | cat >udev_info.out
+
+        exit 0
         """)]
 
     def test_ptable(self):
         self._test_ptable("blkid_output_sda", "dos")
 
     def test_partition_numbers(self):
-        # sdd should have partitions 1 and 10
+        # sdd should have partitions 1, 2, and 10
         disk = "sdd"
-        expected = [disk + s for s in ["", "1", "10"]]
+        expected = [disk + s for s in ["", "1", "2", "10"]]
         self._test_partition_numbers(disk, expected)
 
     def test_fstab_entries(self):
@@ -255,6 +298,12 @@ class TestBasicScsiAbs(TestBasicAbs):
     def test_whole_disk_uuid(self):
         self._test_whole_disk_uuid("sdc", "btrfs_uuid_sdc")
 
+    def test_partition_is_prep(self):
+        self._test_partition_is_prep("udev_info.out")
+
+    def test_partition_is_zero(self):
+        self._test_partition_is_zero("cmp_prep.out")
+
 
 class Centos70XenialTestScsiBasic(centos_relbase.centos70_xenial,
                                   TestBasicScsiAbs, CentosTestBasicAbs):
@@ -280,4 +329,8 @@ class BionicTestScsiBasic(relbase.bionic, TestBasicScsiAbs):
 class CosmicTestScsiBasic(relbase.cosmic, TestBasicScsiAbs):
     __test__ = True
 
+
+class DiscoTestScsiBasic(relbase.disco, TestBasicScsiAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py
index b4191b6..a62fb17 100644
--- a/tests/vmtests/test_bcache_basic.py
+++ b/tests/vmtests/test_bcache_basic.py
@@ -20,6 +20,8 @@ class TestBcacheBasic(VMBaseClass):
         bcache-super-show /dev/vda2 > bcache_super_vda2
         ls /sys/fs/bcache > bcache_ls
         cat /sys/block/bcache0/bcache/cache_mode > bcache_cache_mode
+
+        exit 0
         """)]
 
     def test_bcache_output_files_exist(self):
@@ -69,4 +71,8 @@ class BionicBcacheBasic(relbase.bionic, TestBcacheBasic):
 class CosmicBcacheBasic(relbase.cosmic, TestBcacheBasic):
     __test__ = True
 
+
+class DiscoBcacheBasic(relbase.disco, TestBcacheBasic):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_bcache_bug1718699.py b/tests/vmtests/test_bcache_bug1718699.py
index bc0f1e0..5410dc3 100644
--- a/tests/vmtests/test_bcache_bug1718699.py
+++ b/tests/vmtests/test_bcache_bug1718699.py
@@ -22,4 +22,8 @@ class BionicTestBcacheBug1718699(relbase.bionic, TestBcacheBug1718699):
 class CosmicTestBcacheBug1718699(relbase.cosmic, TestBcacheBug1718699):
     __test__ = True
 
+
+class DiscoTestBcacheBug1718699(relbase.disco, TestBcacheBug1718699):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_fs_battery.py b/tests/vmtests/test_fs_battery.py
index defdf1a..347b62a 100644
--- a/tests/vmtests/test_fs_battery.py
+++ b/tests/vmtests/test_fs_battery.py
@@ -100,6 +100,8 @@ class TestFsBattery(VMBaseClass):
                 echo "$part umount: PASS" ||
                 echo "$part umount: FAIL: $out"
         done >> battery-mount-umount
+
+        exit 0
         """)]
 
     def get_fs_entries(self):
@@ -243,4 +245,7 @@ class CosmicTestFsBattery(relbase.cosmic, TestFsBattery):
     __test__ = True
 
 
+class DiscoTestFsBattery(relbase.disco, TestFsBattery):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py
index a800df5..2707d40 100644
--- a/tests/vmtests/test_iscsi.py
+++ b/tests/vmtests/test_iscsi.py
@@ -23,6 +23,8 @@ class TestBasicIscsiAbs(VMBaseClass):
         cp -a /etc/iscsi ./etc_iscsi
         bash -c \
         'for f in /mnt/iscsi*; do cp $f/testfile testfile${f: -1}; done'
+
+        exit 0
         """)]
 
     def test_fstab_has_netdev_option(self):
@@ -76,4 +78,8 @@ class BionicTestIscsiBasic(relbase.bionic, TestBasicIscsiAbs):
 class CosmicTestIscsiBasic(relbase.cosmic, TestBasicIscsiAbs):
     __test__ = True
 
+
+class DiscoTestIscsiBasic(relbase.disco, TestBasicIscsiAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_journald_reporter.py b/tests/vmtests/test_journald_reporter.py
index c60a862..80af61e 100644
--- a/tests/vmtests/test_journald_reporter.py
+++ b/tests/vmtests/test_journald_reporter.py
@@ -39,4 +39,8 @@ class BionicTestJournaldReporter(relbase.bionic, TestJournaldReporter):
 class CosmicTestJournaldReporter(relbase.cosmic, TestJournaldReporter):
     __test__ = True
 
+
+class DiscoTestJournaldReporter(relbase.disco, TestJournaldReporter):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py
index 37053fe..fdb5314 100644
--- a/tests/vmtests/test_lvm.py
+++ b/tests/vmtests/test_lvm.py
@@ -17,6 +17,8 @@ class TestLvmAbs(VMBaseClass):
         cd OUTPUT_COLLECT_D
         pvdisplay -C --separator = -o vg_name,pv_name --noheadings > pvs
         lvdisplay -C --separator = -o lv_name,vg_name --noheadings > lvs
+
+        exit 0
         """)]
     fstab_expected = {
         '/dev/vg1/lv1': '/srv/data',
@@ -73,4 +75,7 @@ class CosmicTestLvm(relbase.cosmic, TestLvmAbs):
     __test__ = True
 
 
+class DiscoTestLvm(relbase.disco, TestLvmAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py
index 091461e..6cdcab2 100644
--- a/tests/vmtests/test_lvm_iscsi.py
+++ b/tests/vmtests/test_lvm_iscsi.py
@@ -17,13 +17,15 @@ class TestLvmIscsiAbs(TestLvmAbs, TestBasicIscsiAbs):
     conf_file = "examples/tests/lvm_iscsi.yaml"
     nr_testfiles = 4
 
-    extra_collect_scripts = TestLvmAbs.extra_collect_scripts
-    extra_collect_scripts += TestBasicIscsiAbs.extra_collect_scripts
-    extra_collect_scripts += [textwrap.dedent(
-        """
-        cd OUTPUT_COLLECT_D
-        ls -al /sys/class/block/dm*/slaves/  > dm_slaves
-        """)]
+    extra_collect_scripts = (
+        TestLvmAbs.extra_collect_scripts +
+        TestBasicIscsiAbs.extra_collect_scripts +
+        [textwrap.dedent("""
+            cd OUTPUT_COLLECT_D
+            ls -al /sys/class/block/dm*/slaves/  > dm_slaves
+
+            exit 0
+            """)])
 
     fstab_expected = {
         'UUID=6de56115-9500-424b-8151-221b270ec708': '/mnt/iscsi1',
@@ -87,4 +89,8 @@ class BionicTestIscsiLvm(relbase.bionic, TestLvmIscsiAbs):
 class CosmicTestIscsiLvm(relbase.cosmic, TestLvmIscsiAbs):
     __test__ = True
 
+
+class DiscoTestIscsiLvm(relbase.disco, TestLvmIscsiAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py
index 99a33f2..d70f3ef 100644
--- a/tests/vmtests/test_lvm_raid.py
+++ b/tests/vmtests/test_lvm_raid.py
@@ -14,14 +14,18 @@ class TestLvmOverRaidAbs(TestMdadmAbs, TestLvmAbs):
     dirty_disks = True
     extra_disks = ['10G'] * 4
 
-    extra_collect_scripts = TestLvmAbs.extra_collect_scripts
-    extra_collect_scripts += TestMdadmAbs.extra_collect_scripts
-    extra_collect_scripts += [textwrap.dedent("""
-        cd OUTPUT_COLLECT_D
-        ls -al /dev/md* > dev_md
-        cp -a /etc/mdadm etc_mdadm
-        cp -a /etc/lvm etc_lvm
-        """)]
+    extra_collect_scripts = (
+        TestLvmAbs.extra_collect_scripts +
+        TestMdadmAbs.extra_collect_scripts +
+        [textwrap.dedent("""
+            cd OUTPUT_COLLECT_D
+            ls -al /dev/md* > dev_md
+            cp -a /etc/mdadm etc_mdadm
+            cp -a /etc/lvm etc_lvm
+
+            exit 0
+            """)]
+        )
 
     fstab_expected = {
         '/dev/vg1/lv1': '/srv/data',
@@ -39,6 +43,10 @@ class TestLvmOverRaidAbs(TestMdadmAbs, TestLvmAbs):
         self.check_file_strippedline("pvs", "vg0=/dev/md1")
 
 
+class DiscoTestLvmOverRaid(relbase.disco, TestLvmOverRaidAbs):
+    __test__ = True
+
+
 class CosmicTestLvmOverRaid(relbase.cosmic, TestLvmOverRaidAbs):
     __test__ = True
 
diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py
index 7e7472d..d726a45 100644
--- a/tests/vmtests/test_lvm_root.py
+++ b/tests/vmtests/test_lvm_root.py
@@ -26,6 +26,8 @@ class TestLvmRootAbs(VMBaseClass):
         vgdisplay > vgdisplay
         lvdisplay > lvdisplay
         ls -al /dev/root_vg/ > dev_root_vg
+
+        exit 0
         """)]
     fstab_expected = {
         'UUID=04836770-e989-460f-8774-8e277ddcb40f': '/',
diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py
index adfa55b..f38d4f7 100644
--- a/tests/vmtests/test_mdadm_bcache.py
+++ b/tests/vmtests/test_mdadm_bcache.py
@@ -23,6 +23,8 @@ class TestMdadmAbs(VMBaseClass):
         ls -al /sys/fs/bcache/* > lsal_sys_fs_bcache_star
         ls -al /dev/bcache* > lsal_dev_bcache_star
         ls -al /dev/bcache/by_uuid/* > lsal_dev_bcache_byuuid_star
+
+        exit 0
         """)]
 
     def test_mdadm_output_files_exist(self):
@@ -63,6 +65,8 @@ class TestMdadmBcacheAbs(TestMdadmAbs):
         cat /sys/block/bcache0/bcache/cache_mode > bcache_cache_mode
         cat /sys/block/bcache1/bcache/cache_mode >> bcache_cache_mode
         cat /sys/block/bcache2/bcache/cache_mode >> bcache_cache_mode
+
+        exit 0
         """)]
     fstab_expected = {
         '/dev/vda1': '/media/sda1',
@@ -151,6 +155,10 @@ class CosmicTestMdadmBcache(relbase.cosmic, TestMdadmBcacheAbs):
     __test__ = True
 
 
+class DiscoTestMdadmBcache(relbase.disco, TestMdadmBcacheAbs):
+    __test__ = True
+
+
 class TestMirrorbootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot.yaml"
@@ -196,6 +204,10 @@ class CosmicTestMirrorboot(relbase.cosmic, TestMirrorbootAbs):
     __test__ = True
 
 
+class DiscoTestMirrorboot(relbase.disco, TestMirrorbootAbs):
+    __test__ = True
+
+
 class TestMirrorbootPartitionsAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot-msdos-partition.yaml"
@@ -247,6 +259,11 @@ class CosmicTestMirrorbootPartitions(relbase.cosmic,
     __test__ = True
 
 
+class DiscoTestMirrorbootPartitions(relbase.disco,
+                                    TestMirrorbootPartitionsAbs):
+    __test__ = True
+
+
 class TestMirrorbootPartitionsUEFIAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/mirrorboot-uefi.yaml"
@@ -297,6 +314,11 @@ class CosmicTestMirrorbootPartitionsUEFI(relbase.cosmic,
     __test__ = True
 
 
+class DiscoTestMirrorbootPartitionsUEFI(relbase.disco,
+                                        TestMirrorbootPartitionsUEFIAbs):
+    __test__ = True
+
+
 class TestRaid5bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid5boot.yaml"
@@ -342,6 +364,10 @@ class CosmicTestRaid5boot(relbase.cosmic, TestRaid5bootAbs):
     __test__ = True
 
 
+class DiscoTestRaid5boot(relbase.disco, TestRaid5bootAbs):
+    __test__ = True
+
+
 class TestRaid6bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid6boot.yaml"
@@ -357,6 +383,8 @@ class TestRaid6bootAbs(TestMdadmAbs):
         TestMdadmAbs.extra_collect_scripts + [textwrap.dedent("""
         cd OUTPUT_COLLECT_D
         mdadm --detail --scan > mdadm_detail
+
+        exit 0
         """)])
 
     def test_raid6_output_files_exist(self):
@@ -400,6 +428,10 @@ class CosmicTestRaid6boot(relbase.cosmic, TestRaid6bootAbs):
     __test__ = True
 
 
+class DiscoTestRaid6boot(relbase.disco, TestRaid6bootAbs):
+    __test__ = True
+
+
 class TestRaid10bootAbs(TestMdadmAbs):
     # alternative config for more complex setup
     conf_file = "examples/tests/raid10boot.yaml"
@@ -446,6 +478,10 @@ class CosmicTestRaid10boot(relbase.cosmic, TestRaid10bootAbs):
     __test__ = True
 
 
+class DiscoTestRaid10boot(relbase.disco, TestRaid10bootAbs):
+    __test__ = True
+
+
 class TestAllindataAbs(TestMdadmAbs):
     # more complex, needs more time
     # alternative config for more complex setup
@@ -493,6 +529,8 @@ class TestAllindataAbs(TestMdadmAbs):
         mkdir -p /tmp/xfstest
         mount /dev/mapper/dmcrypt0 /tmp/xfstest
         xfs_info /tmp/xfstest/ > xfs_info
+
+        exit 0
         """)])
     fstab_expected = {
         '/dev/vg1/lv1': '/srv/data',
@@ -547,4 +585,8 @@ class BionicTestAllindata(relbase.bionic, TestAllindataAbs):
 class CosmicTestAllindata(relbase.cosmic, TestAllindataAbs):
     __test__ = True
 
+
+class DiscoTestAllindata(relbase.disco, TestAllindataAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_mdadm_iscsi.py b/tests/vmtests/test_mdadm_iscsi.py
index 537baec..b43855d 100644
--- a/tests/vmtests/test_mdadm_iscsi.py
+++ b/tests/vmtests/test_mdadm_iscsi.py
@@ -18,12 +18,15 @@ class TestMdadmIscsiAbs(TestMdadmAbs, TestBasicIscsiAbs):
     conf_file = "examples/tests/mdadm_iscsi.yaml"
     nr_testfiles = 1
 
-    extra_collect_scripts = TestMdadmAbs.extra_collect_scripts
-    extra_collect_scripts += TestBasicIscsiAbs.extra_collect_scripts
-    extra_collect_scripts += [textwrap.dedent("""
-        cd OUTPUT_COLLECT_D
-        ls -al /sys/class/block/md*/slaves/  > md_slaves
-        """)]
+    extra_collect_scripts = (
+        TestMdadmAbs.extra_collect_scripts +
+        TestBasicIscsiAbs.extra_collect_scripts +
+        [textwrap.dedent("""
+            cd OUTPUT_COLLECT_D
+            ls -al /sys/class/block/md*/slaves/  > md_slaves
+
+            exit 0
+            """)])
 
 
 class Centos70TestIscsiMdadm(centos_relbase.centos70_xenial,
@@ -54,4 +57,8 @@ class BionicTestIscsiMdadm(relbase.bionic, TestMdadmIscsiAbs):
 class CosmicTestIscsiMdadm(relbase.cosmic, TestMdadmIscsiAbs):
     __test__ = True
 
+
+class DiscoTestIscsiMdadm(relbase.disco, TestMdadmIscsiAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py
index a6bd8ce..a22bc0f 100644
--- a/tests/vmtests/test_multipath.py
+++ b/tests/vmtests/test_multipath.py
@@ -4,6 +4,8 @@ from . import VMBaseClass
 from .releases import base_vm_classes as relbase
 from .releases import centos_base_vm_classes as centos_relbase
 
+from unittest import SkipTest
+import os
 import textwrap
 
 
@@ -22,6 +24,11 @@ class TestMultipathBasicAbs(VMBaseClass):
         cp -a /etc/multipath* .
         readlink -f /sys/class/block/sda/holders/dm-0 > holders_sda
         readlink -f /sys/class/block/sdb/holders/dm-0 > holders_sdb
+        command -v systemctl && {
+            systemctl show -- home.mount > systemctl_show_home.mount;
+            systemctl status --full home.mount > systemctl_status_home.mount
+        }
+        exit 0
         """)]
 
     def test_multipath_disks_match(self):
@@ -31,6 +38,26 @@ class TestMultipathBasicAbs(VMBaseClass):
         print('sdb holders:\n%s' % sdb_data)
         self.assertEqual(sda_data, sdb_data)
 
+    def test_home_mount_unit(self):
+        unit_file = 'systemctl_show_home.mount'
+        if not os.path.exists(self.collect_path(unit_file)):
+            raise SkipTest(
+                'target_release=%s does not use systemd' % self.target_release)
+
+        # We can't use load_shell_content as systemctl show output
+        # does not quote values even though it's in Key=Value format
+        content = self.load_collect_file(unit_file)
+        expected_results = {
+            'ActiveState': 'active',
+            'Result': 'success',
+            'SubState': 'mounted',
+        }
+        show = {key: value for key, value in
+                [line.split('=') for line in content.splitlines()
+                 if line.split('=')[0] in expected_results.keys()]}
+
+        self.assertEqual(sorted(expected_results), sorted(show))
+
 
 class Centos70TestMultipathBasic(centos_relbase.centos70_xenial,
                                  TestMultipathBasicAbs):
@@ -65,4 +92,8 @@ class BionicTestMultipathBasic(relbase.bionic, TestMultipathBasicAbs):
 class CosmicTestMultipathBasic(relbase.cosmic, TestMultipathBasicAbs):
     __test__ = True
 
+
+class DiscoTestMultipathBasic(relbase.disco, TestMultipathBasicAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
index ce4cdb9..1b0e41c 100644
--- a/tests/vmtests/test_network.py
+++ b/tests/vmtests/test_network.py
@@ -49,6 +49,8 @@ class TestNetworkBaseTestsAbs(VMBaseClass):
         cp -a /etc/systemd ./etc_systemd ||:
         journalctl --no-pager -b -x | tee journalctl_out
         sleep 10 && ip a | tee  ip_a
+
+        exit 0
         """)]
 
     def test_output_files_exist(self):
@@ -473,6 +475,10 @@ class CosmicTestNetworkBasic(relbase.cosmic, TestNetworkBasicAbs):
     __test__ = True
 
 
+class DiscoTestNetworkBasic(relbase.disco, TestNetworkBasicAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkBasic(centos_relbase.centos66_xenial,
                                CentosTestNetworkBasicAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
index 1d1837f..b2c4ed7 100644
--- a/tests/vmtests/test_network_alias.py
+++ b/tests/vmtests/test_network_alias.py
@@ -26,6 +26,8 @@ class CentosTestNetworkAliasAbs(TestNetworkAliasAbs):
             cp -a /var/log/cloud-init* .
             cp -a /var/lib/cloud ./var_lib_cloud
             cp -a /run/cloud-init ./run_cloud-init
+
+            exit 0
         """)]
 
     def test_etc_resolvconf(self):
@@ -76,4 +78,8 @@ class BionicTestNetworkAlias(relbase.bionic, TestNetworkAliasAbs):
 class CosmicTestNetworkAlias(relbase.cosmic, TestNetworkAliasAbs):
     __test__ = True
 
+
+class DiscoTestNetworkAlias(relbase.disco, TestNetworkAliasAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py
index 572f240..fe3abe9 100644
--- a/tests/vmtests/test_network_bonding.py
+++ b/tests/vmtests/test_network_bonding.py
@@ -33,6 +33,8 @@ class CentosTestNetworkBondingAbs(TestNetworkBondingAbs):
             cp -a /var/lib/cloud ./var_lib_cloud
             cp -a /run/cloud-init ./run_cloud-init
             rpm -qf `which ifenslave` |tee ifenslave_installed
+
+            exit 0
         """)]
 
     def test_ifenslave_package_status(self):
@@ -79,6 +81,10 @@ class CosmicTestBonding(relbase.cosmic, TestNetworkBondingAbs):
     __test__ = True
 
 
+class DiscoTestBonding(relbase.disco, TestNetworkBondingAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkBonding(centos_relbase.centos66_xenial,
                                  CentosTestNetworkBondingAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
index ed9b728..8576d60 100644
--- a/tests/vmtests/test_network_bridging.py
+++ b/tests/vmtests/test_network_bridging.py
@@ -102,6 +102,8 @@ class TestBridgeNetworkAbs(TestNetworkBaseTestsAbs):
         grep -r . /sys/class/net/br0 > sysfs_br0
         grep -r . /sys/class/net/br0/brif/eth1 > sysfs_br0_eth1
         grep -r . /sys/class/net/br0/brif/eth2 > sysfs_br0_eth2
+
+        exit 0
         """)]
 
     def test_output_files_exist_bridge(self):
@@ -200,6 +202,8 @@ class CentosTestBridgeNetworkAbs(TestBridgeNetworkAbs):
             cp -a /var/lib/cloud ./var_lib_cloud
             cp -a /run/cloud-init ./run_cloud-init
             rpm -qf `which brctl` |tee bridge-utils_installed
+
+            exit 0
         """)]
 
     def test_etc_network_interfaces(self):
@@ -236,4 +240,7 @@ class CosmicTestBridging(relbase.cosmic, TestBridgeNetworkAbs):
     __test__ = True
 
 
+class DiscoTestBridging(relbase.disco, TestBridgeNetworkAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
index b8a69e8..42adb20 100644
--- a/tests/vmtests/test_network_ipv6.py
+++ b/tests/vmtests/test_network_ipv6.py
@@ -21,6 +21,8 @@ class TestNetworkIPV6Abs(TestNetworkBaseTestsAbs):
         grep . -r /sys/class/net/bond0/ > sysfs_bond0 || :
         grep . -r /sys/class/net/bond0.108/ > sysfs_bond0.108 || :
         grep . -r /sys/class/net/bond0.208/ > sysfs_bond0.208 || :
+
+        exit 0
         """)]
 
 
@@ -32,6 +34,8 @@ class CentosTestNetworkIPV6Abs(TestNetworkIPV6Abs):
             cp -a /var/log/cloud-init* .
             cp -a /var/lib/cloud ./var_lib_cloud
             cp -a /run/cloud-init ./run_cloud-init
+
+            exit 0
         """)]
 
     def test_etc_network_interfaces(self):
@@ -72,6 +76,10 @@ class CosmicTestNetworkIPV6(relbase.cosmic, TestNetworkIPV6Abs):
     __test__ = True
 
 
+class DiscoTestNetworkIPV6(relbase.disco, TestNetworkIPV6Abs):
+    __test__ = True
+
+
 class Centos66TestNetworkIPV6(centos_relbase.centos66_xenial,
                               CentosTestNetworkIPV6Abs):
     __test__ = True
diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
index 7ebc5eb..bbd90c9 100644
--- a/tests/vmtests/test_network_ipv6_static.py
+++ b/tests/vmtests/test_network_ipv6_static.py
@@ -54,6 +54,10 @@ class CosmicTestNetworkIPV6Static(relbase.cosmic, TestNetworkIPV6StaticAbs):
     __test__ = True
 
 
+class DiscoTestNetworkIPV6Static(relbase.disco, TestNetworkIPV6StaticAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkIPV6Static(centos_relbase.centos66_xenial,
                                     CentosTestNetworkIPV6StaticAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
index 2f7bd49..7401d2c 100644
--- a/tests/vmtests/test_network_ipv6_vlan.py
+++ b/tests/vmtests/test_network_ipv6_vlan.py
@@ -35,6 +35,10 @@ class CosmicTestNetworkIPV6Vlan(relbase.cosmic, TestNetworkIPV6VlanAbs):
     __test__ = True
 
 
+class DiscoTestNetworkIPV6Vlan(relbase.disco, TestNetworkIPV6VlanAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkIPV6Vlan(centos_relbase.centos66_xenial,
                                   CentosTestNetworkIPV6VlanAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
index eaa383b..ffde5c7 100644
--- a/tests/vmtests/test_network_mtu.py
+++ b/tests/vmtests/test_network_mtu.py
@@ -36,6 +36,8 @@ class TestNetworkMtuAbs(TestNetworkIPV6Abs):
         if [ -e /var/log/upstart ]; then
           cp -a /var/log/upstart ./var_log_upstart
         fi
+
+        exit 0
         """)]
 
     def _load_mtu_data(self, ifname):
@@ -128,6 +130,8 @@ class CentosTestNetworkMtuAbs(TestNetworkMtuAbs):
             cp -a /var/log/cloud-init* .
             cp -a /var/lib/cloud ./var_lib_cloud
             cp -a /run/cloud-init ./run_cloud-init
+
+            exit 0
         """)]
 
     def test_etc_network_interfaces(self):
@@ -200,6 +204,11 @@ class CosmicTestNetworkMtu(relbase.cosmic, TestNetworkMtuAbs):
     __test__ = True
 
 
[e-mail]_by_date("1671951", fixby="2019-01-02")
+class DiscoTestNetworkMtu(relbase.disco, TestNetworkMtuAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkMtu(centos_relbase.centos66_xenial,
                              CentosTestNetworkMtuAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
index 9e042a5..6820c33 100644
--- a/tests/vmtests/test_network_static.py
+++ b/tests/vmtests/test_network_static.py
@@ -59,6 +59,10 @@ class CosmicTestNetworkStatic(relbase.cosmic, TestNetworkStaticAbs):
     __test__ = True
 
 
+class DiscoTestNetworkStatic(relbase.disco, TestNetworkStaticAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkStatic(centos_relbase.centos66_xenial,
                                 CentosTestNetworkStaticAbs):
     __test__ = True
diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
index ad18eef..405a730 100644
--- a/tests/vmtests/test_network_static_routes.py
+++ b/tests/vmtests/test_network_static_routes.py
@@ -59,6 +59,11 @@ class CosmicTestNetworkStaticRoutes(relbase.cosmic,
     __test__ = True
 
 
+class DiscoTestNetworkStaticRoutes(relbase.disco,
+                                   TestNetworkStaticRoutesAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkStaticRoutes(centos_relbase.centos66_xenial,
                                       CentosTestNetworkStaticRoutesAbs):
     __test__ = False
diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
index 9e55bfa..904f8c2 100644
--- a/tests/vmtests/test_network_vlan.py
+++ b/tests/vmtests/test_network_vlan.py
@@ -18,6 +18,8 @@ class TestNetworkVlanAbs(TestNetworkBaseTestsAbs):
              ip -d link show interface1.2668 |tee ip_link_show_interface1.2668
              ip -d link show interface1.2669 |tee ip_link_show_interface1.2669
              ip -d link show interface1.2670 |tee ip_link_show_interface1.2670
+
+             exit 0
              """)]
 
     def get_vlans(self):
@@ -86,6 +88,10 @@ class CosmicTestNetworkVlan(relbase.cosmic, TestNetworkVlanAbs):
     __test__ = True
 
 
+class DiscoTestNetworkVlan(relbase.disco, TestNetworkVlanAbs):
+    __test__ = True
+
+
 class Centos66TestNetworkVlan(centos_relbase.centos66_xenial,
                               CentosTestNetworkVlanAbs):
     __test__ = True
diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py
index f3d1ae2..60d9d86 100644
--- a/tests/vmtests/test_nvme.py
+++ b/tests/vmtests/test_nvme.py
@@ -19,14 +19,17 @@ class TestNvmeAbs(VMBaseClass):
     conf_file = "examples/tests/nvme.yaml"
     extra_disks = []
     nvme_disks = ['4G', '4G']
-    disk_to_check = [('main_disk', 1), ('main_disk', 2), ('main_disk', 15),
-                     ('nvme_disk', 1), ('nvme_disk', 2), ('nvme_disk', 3),
-                     ('second_nvme', 1)]
+    disk_to_check = [
+        ('main_disk', 1), ('main_disk', 2), ('main_disk', 15),
+        ('nvme_disk', 0), ('nvme_disk', 1), ('nvme_disk', 2), ('nvme_disk', 3),
+        ('second_nvme', 0), ('second_nvme', 1)]
     extra_collect_scripts = [textwrap.dedent("""
         cd OUTPUT_COLLECT_D
         ls /sys/class/ > sys_class
         ls /sys/class/nvme/ > ls_nvme
         ls /dev/nvme* > ls_dev_nvme
+
+        exit 0
         """)]
 
     def _test_nvme_device_names(self, expected):
@@ -82,6 +85,10 @@ class CosmicTestNvme(relbase.cosmic, TestNvmeAbs):
     __test__ = True
 
 
+class DiscoTestNvme(relbase.cosmic, TestNvmeAbs):
+    __test__ = True
+
+
 class TestNvmeBcacheAbs(TestNvmeAbs):
     arch_skip = [
         "s390x",  # nvme is a pci device, no pci on s390x
@@ -91,7 +98,8 @@ class TestNvmeBcacheAbs(TestNvmeAbs):
     extra_disks = ['10G']
     nvme_disks = ['6G']
     uefi = True
-    disk_to_check = [('sda', 1), ('sda', 2), ('sda', 3)]
+    disk_to_check = [('sda', 1), ('sda', 2), ('sda', 3),
+                     ('sdb', 0), ('nvme0n1', 0)]
 
     extra_collect_scripts = [textwrap.dedent("""
         cd OUTPUT_COLLECT_D
@@ -102,6 +110,8 @@ class TestNvmeBcacheAbs(TestNvmeAbs):
         bcache-super-show /dev/nvme0n1p1 > bcache_super_nvme0n1p1
         ls /sys/fs/bcache > bcache_ls
         cat /sys/block/bcache0/bcache/cache_mode > bcache_cache_mode
+
+        exit 0
         """)]
 
     def test_bcache_output_files_exist(self):
@@ -145,4 +155,7 @@ class CosmicTestNvmeBcache(relbase.cosmic, TestNvmeBcacheAbs):
     __test__ = True
 
 
+class DiscoTestNvmeBcache(relbase.disco, TestNvmeBcacheAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_old_apt_features.py b/tests/vmtests/test_old_apt_features.py
index 33561a3..ec3765c 100644
--- a/tests/vmtests/test_old_apt_features.py
+++ b/tests/vmtests/test_old_apt_features.py
@@ -5,6 +5,7 @@
 """
 import re
 import textwrap
+import yaml
 
 from . import VMBaseClass
 from .releases import base_vm_classes as relbase
@@ -50,6 +51,8 @@ class TestOldAptAbs(VMBaseClass):
         cp /etc/apt/sources.list .
         cp /etc/cloud/cloud.cfg.d/curtin-preserve-sources.cfg .
         cp /etc/cloud/cloud.cfg.d/90_dpkg.cfg .
+
+        exit 0
         """)]
     arch = util.get_architecture()
     if arch in ['amd64', 'i386']:
@@ -69,8 +72,10 @@ class TestOldAptAbs(VMBaseClass):
 
     def test_preserve_source(self):
         """test_preserve_source - no clobbering sources.list by cloud-init"""
-        self.check_file_regex("curtin-preserve-sources.cfg",
-                              "apt_preserve_sources_list.*true")
+        # For earlier than xenial 'apt_preserve_sources_list' is expected
+        self.assertEqual(
+            {'apt': {'preserve_sources_list': True}},
+            yaml.load(self.load_collect_file("curtin-preserve-sources.cfg")))
 
     def test_debconf(self):
         """test_debconf - Check if debconf is in place"""
diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py
index 13dd28c..c1c6c36 100644
--- a/tests/vmtests/test_pollinate_useragent.py
+++ b/tests/vmtests/test_pollinate_useragent.py
@@ -18,6 +18,8 @@ class TestPollinateUserAgent(VMBaseClass):
         cd OUTPUT_COLLECT_D
         cp -a /etc/pollinate etc_pollinate
         pollinate --print-user-agent > pollinate_print_user_agent
+
+        exit 0
         """)]
 
     def test_pollinate_user_agent(self):
@@ -66,4 +68,8 @@ class BionicTestPollinateUserAgent(relbase.bionic, TestPollinateUserAgent):
 class CosmicTestPollinateUserAgent(relbase.cosmic, TestPollinateUserAgent):
     __test__ = True
 
+
+class DiscoTestPollinateUserAgent(relbase.disco, TestPollinateUserAgent):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py
index 8d24f8e..76d0eed 100644
--- a/tests/vmtests/test_raid5_bcache.py
+++ b/tests/vmtests/test_raid5_bcache.py
@@ -16,6 +16,8 @@ class TestMdadmAbs(VMBaseClass):
         mdadm --detail --scan > mdadm_status
         mdadm --detail --scan | grep -c ubuntu > mdadm_active1
         grep -c active /proc/mdstat > mdadm_active2
+
+        exit 0
         """)]
 
     def test_mdadm_output_files_exist(self):
@@ -33,13 +35,15 @@ class TestMdadmBcacheAbs(TestMdadmAbs):
     conf_file = "examples/tests/raid5bcache.yaml"
     disk_to_check = [('md0', 0), ('sda', 2)]
 
-    extra_collect_scripts = TestMdadmAbs.extra_collect_scripts
-    extra_collect_scripts += [textwrap.dedent("""
-        cd OUTPUT_COLLECT_D
-        bcache-super-show /dev/vda2 > bcache_super_vda2
-        ls /sys/fs/bcache > bcache_ls
-        cat /sys/block/bcache0/bcache/cache_mode > bcache_cache_mode
-        """)]
+    extra_collect_scripts = (
+        TestMdadmAbs.extra_collect_scripts +
+        [textwrap.dedent("""\
+            cd OUTPUT_COLLECT_D
+            bcache-super-show /dev/vda2 > bcache_super_vda2
+            ls /sys/fs/bcache > bcache_ls
+            cat /sys/block/bcache0/bcache/cache_mode > bcache_cache_mode
+
+            exit 0""")])
     fstab_expected = {
         '/dev/bcache0': '/',
         '/dev/md0': '/srv/data',
@@ -101,4 +105,8 @@ class BionicTestRaid5Bcache(relbase.bionic, TestMdadmBcacheAbs):
 class CosmicTestRaid5Bcache(relbase.cosmic, TestMdadmBcacheAbs):
     __test__ = True
 
+
+class DiscoTestRaid5Bcache(relbase.disco, TestMdadmBcacheAbs):
+    __test__ = True
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
index 8948f72..625f841 100644
--- a/tests/vmtests/test_simple.py
+++ b/tests/vmtests/test_simple.py
@@ -8,13 +8,15 @@ import textwrap
 
 
 class TestSimple(VMBaseClass):
-    # Test that curtin with no config does the right thing
+    """ Test that curtin runs block-meta simple mode correctly. """
     conf_file = "examples/tests/simple.yaml"
     extra_disks = []
     extra_nics = []
     extra_collect_scripts = [textwrap.dedent("""
         cd OUTPUT_COLLECT_D
         cp /etc/netplan/50-cloud-init.yaml netplan.yaml
+
+        exit 0
         """)]
 
 
@@ -43,4 +45,68 @@ class CosmicTestSimple(relbase.cosmic, TestSimple):
     def test_output_files_exist(self):
         self.output_files_exist(["netplan.yaml"])
 
+
+class DiscoTestSimple(relbase.disco, TestSimple):
+    __test__ = True
+
+    def test_output_files_exist(self):
+        self.output_files_exist(["netplan.yaml"])
+
+
+class TestSimpleStorage(VMBaseClass):
+    """ Test curtin runs clear-holders when mode=simple with storage cfg. """
+    conf_file = "examples/tests/simple-storage.yaml"
+    dirty_disks = True
+    extra_disks = ['5G', '5G']
+    extra_nics = []
+    extra_collect_scripts = [textwrap.dedent("""
+        cd OUTPUT_COLLECT_D
+        sfdisk --list > sfdisk_list
+        for d in /dev/[sv]d[a-z] /dev/xvd?; do
+            [ -b "$d" ] || continue
+            echo == $d ==
+            sgdisk --print $d
+        done > sgdisk_list
+        blkid > blkid
+        cat /proc/partitions > proc_partitions
+        cp /etc/network/interfaces interfaces
+        cp /etc/netplan/50-cloud-init.yaml netplan.yaml
+        if [ -f /var/log/cloud-init-output.log ]; then
+           cp /var/log/cloud-init-output.log .
+        fi
+        cp /var/log/cloud-init.log .
+        find /etc/network/interfaces.d > find_interfacesd
+        exit 0
+        """)]
+
+    def test_output_files_exist(self):
+        self.output_files_exist(["sfdisk_list", "blkid",
+                                 "proc_partitions"])
+
+
+class XenialGATestSimpleStorage(relbase.xenial, TestSimpleStorage):
+    __test__ = True
+
+
+class BionicTestSimpleStorage(relbase.bionic, TestSimpleStorage):
+    __test__ = True
+
+    def test_output_files_exist(self):
+        self.output_files_exist(["netplan.yaml"])
+
+
+class CosmicTestSimpleStorage(relbase.cosmic, TestSimpleStorage):
+    __test__ = True
+
+    def test_output_files_exist(self):
+        self.output_files_exist(["netplan.yaml"])
+
+
+class DiscoTestSimpleStorage(relbase.disco, TestSimpleStorage):
+    __test__ = True
+
+    def test_output_files_exist(self):
+        self.output_files_exist(["netplan.yaml"])
+
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_ubuntu_core.py b/tests/vmtests/test_ubuntu_core.py
index 732399b..a282940 100644
--- a/tests/vmtests/test_ubuntu_core.py
+++ b/tests/vmtests/test_ubuntu_core.py
@@ -18,6 +18,8 @@ class TestUbuntuCoreAbs(VMBaseClass):
         cp -a /etc/cloud ./etc_cloud |:
         cp -a /home . |:
         cp -a /var/lib/extrausers . |:
+
+        exit 0
         """)]
 
     def test_ubuntu_core_snaps_installed(self):
diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py
index 40ece65..f0e48c6 100644
--- a/tests/vmtests/test_uefi_basic.py
+++ b/tests/vmtests/test_uefi_basic.py
@@ -24,6 +24,8 @@ class TestBasicAbs(VMBaseClass):
         blockdev --getss /dev/vda | cat >vda_blockdev_getss
         blockdev --getpbsz /dev/vda | cat >vda_blockdev_getpbsz
         blockdev --getbsz /dev/vda | cat >vda_blockdev_getbsz
+
+        exit 0
         """)]
 
     def test_sys_firmware_efi(self):
@@ -91,7 +93,7 @@ class TrustyUefiTestBasic(relbase.trusty, TestBasicAbs):
     __test__ = True
 
 
-class TrustyHWEXUefiTestBasic(relbase.trusty_hwe_x, TrustyUefiTestBasic):
+class TrustyHWEXUefiTestBasic(relbase.trusty_hwe_x, TestBasicAbs):
     __test__ = True
 
 
@@ -115,27 +117,35 @@ class CosmicUefiTestBasic(relbase.cosmic, TestBasicAbs):
     __test__ = True
 
 
+class DiscoUefiTestBasic(relbase.disco, TestBasicAbs):
+    __test__ = True
+
+
 class Centos70UefiTestBasic4k(centos_relbase.centos70_xenial, TestBasicAbs):
     disk_block_size = 4096
 
 
-class TrustyUefiTestBasic4k(TrustyUefiTestBasic):
+class TrustyUefiTestBasic4k(relbase.trusty, TestBasicAbs):
     disk_block_size = 4096
 
 
-class TrustyHWEXUefiTestBasic4k(relbase.trusty_hwe_x, TrustyUefiTestBasic4k):
-    __test__ = True
+class TrustyHWEXUefiTestBasic4k(relbase.trusty_hwe_x, TestBasicAbs):
+    disk_block_size = 4096
+
+
+class XenialGAUefiTestBasic4k(relbase.xenial_ga, TestBasicAbs):
+    disk_block_size = 4096
 
 
-class XenialGAUefiTestBasic4k(XenialGAUefiTestBasic):
+class BionicUefiTestBasic4k(relbase.bionic, TestBasicAbs):
     disk_block_size = 4096
 
 
-class BionicUefiTestBasic4k(BionicUefiTestBasic):
+class CosmicUefiTestBasic4k(relbase.cosmic, TestBasicAbs):
     disk_block_size = 4096
 
 
-class CosmicUefiTestBasic4k(CosmicUefiTestBasic):
+class DiscoUefiTestBasic4k(relbase.disco, TestBasicAbs):
     disk_block_size = 4096
 
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
index 4e257ae..473c9e3 100644
--- a/tests/vmtests/test_zfsroot.py
+++ b/tests/vmtests/test_zfsroot.py
@@ -17,6 +17,8 @@ class TestZfsRootAbs(VMBaseClass):
             zfs list > zfs_list
             zpool list > zpool_list
             zpool status > zpool_status
+
+            exit 0
         """)]
 
     @skip_if_flag('expected_failure')
@@ -88,6 +90,10 @@ class CosmicTestZfsRoot(relbase.cosmic, TestZfsRootAbs):
     __test__ = True
 
 
+class DiscoTestZfsRoot(relbase.disco, TestZfsRootAbs):
+    __test__ = True
+
+
 class TestZfsRootFsTypeAbs(TestZfsRootAbs):
     conf_file = "examples/tests/basic-zfsroot.yaml"
 
@@ -108,3 +114,7 @@ class BionicTestZfsRootFsType(relbase.bionic, TestZfsRootFsTypeAbs):
 
 class CosmicTestZfsRootFsType(relbase.cosmic, TestZfsRootFsTypeAbs):
     __test__ = True
+
+
+class DiscoTestZfsRootFsType(relbase.disco, TestZfsRootFsTypeAbs):
+    __test__ = True
diff --git a/tools/jenkins-runner b/tools/jenkins-runner
index c1cef8e..bf8ea0a 100755
--- a/tools/jenkins-runner
+++ b/tools/jenkins-runner
@@ -79,14 +79,14 @@ if [ "${#tests[@]}" -ne 0 -a "${#ntfilters[@]}" -ne 0 ]; then
     error "Passing test tests and --filter are incompatible."
     error "test arguments provided were: ${#tests[*]}"
     fail
-elif [ "${#tests[@]}" -eq 0 ]; then
+elif [ "${#tests[@]}" -eq 0 -a "${#ntfilters[@]}" -eq 0 ]; then
     tests=( tests/vmtests )
 elif [ "${#ntfilters[@]}" -ne 0 ]; then
-   tests=( $(./tools/vmtest-filter "${ntfilters[@]}") )
-   if [ "${#tests[@]}" -eq 0 ]; then
-      error "Failed to find any tests with filter(s): \"${ntfilters[*]}\""
-      fail "Try testing filters with: ./tools/vmtest-filter ${ntfilters[*]}"
-   fi
+    tests=( $(./tools/vmtest-filter "${ntfilters[@]}") )
+    if [ "${#tests[@]}" -eq 0 ]; then
+        error "Failed to find any tests with filter(s): \"${ntfilters[*]}\""
+        fail "Try testing filters with: ./tools/vmtest-filter ${ntfilters[*]}"
+    fi
 fi
 
 CURTIN_VMTEST_PARALLEL=$parallel