Merge ~mwhudson/curtin:v2-remaining-fixes into curtin:master

[Michael Hudson-Doyle]

block_meta_v2: a few more fixes for v2 partitioning

With this and the other branches I have in review, at least some
vmtests pass when converted to v2 storage configs.

82e1b35... by Michael Hudson-Doyle on 2022-02-21

remove offset from injected prep partition

as v2 partitioning respects offsets, this now causes failures

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

PASSED: Continuous integration, rev:82e1b354a2671698973f7cc20d1d1a6511e2edf9
https://jenkins.ubuntu.com/server/job/curtin-ci/251/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/251/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/251/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/251/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/251/

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

review: Approve (continuous-integration)

[Dan Bungert (dbungert)]

review: Approve

diff --git a/curtin/block/deps.py b/curtin/block/deps.py
index 38581a8..db449d8 100644
--- a/curtin/block/deps.py
+++ b/curtin/block/deps.py
@@ -96,8 +96,12 @@ def detect_required_packages_mapping(osfamily=DISTROS.debian):
     if osfamily not in distro_mapping:
         raise ValueError('No block package mapping for distro: %s' % osfamily)
 
-    return {1: {'handler': storage_config_required_packages,
-                'mapping': distro_mapping.get(osfamily)}}
+    cfg_map = {
+        'handler': storage_config_required_packages,
+        'mapping': distro_mapping.get(osfamily),
+        }
+
+    return {1: cfg_map, 2: cfg_map}
 
 
 # vi: ts=4 expandtab syntax=python
diff --git a/curtin/commands/block_meta_v2.py b/curtin/commands/block_meta_v2.py
index 772c347..c29f98d 100644
--- a/curtin/commands/block_meta_v2.py
+++ b/curtin/commands/block_meta_v2.py
@@ -15,6 +15,7 @@ from curtin.log import LOG
 from curtin.storage_config import (
     GPT_GUID_TO_CURTIN_MAP,
     )
+from curtin.udev import udevadm_settle
 
 
 @attr.s(auto_attribs=True)
@@ -69,10 +70,16 @@ class SFDiskPartTable:
     def apply(self, device):
         sfdisk_script = self.render()
         LOG.debug("sfdisk input:\n---\n%s\n---\n", sfdisk_script)
-        util.subp(
-            ['sfdisk', '--lock', '--no-tell', device],
-            data=sfdisk_script.encode('ascii'))
-        util.subp(['partprobe', device])
+        util.subp(['sfdisk', device], data=sfdisk_script.encode('ascii'))
+        # sfdisk (as invoked here) uses ioctls to inform the kernel that the
+        # partition table has changed so it can add and remove device nodes for
+        # the partitions as needed. Unfortunately this is asynchronous: sfdisk
+        # can exit before the nodes are present in /dev (or /sys for that
+        # matter). Calling "udevadm settle" is slightly incoherent as udev has
+        # nothing to do with creating these nodes, but at the same time, udev
+        # won't finish processing the events triggered by the sfdisk until
+        # after the nodes for the partitions have been updated by the kernel.
+        udevadm_settle()
 
 
 class GPTPartTable(SFDiskPartTable):
@@ -217,10 +224,16 @@ def disk_handler_v2(info, storage_config, handlers):
     preserved_offsets = set()
     wipes = {}
 
-    sfdisk_info = block.sfdisk_info(disk)
+    sfdisk_info = None
     for action in part_actions:
         entry = table.add(action)
         if action.get('preserve', False):
+            if sfdisk_info is None:
+                # Lazily computing sfdisk_info is slightly more efficient but
+                # the real reason for doing this is that calling sfdisk_info on
+                # a disk with no partition table logs messages that makes the
+                # vmtest infrastructure unhappy.
+                sfdisk_info = block.sfdisk_info(disk)
             part_info = _find_part_info(sfdisk_info, entry.start)
             partition_verify_sfdisk(action, sfdisk_info['label'], part_info)
             preserved_offsets.add(entry.start)
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index fd6c246..60d7731 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -2573,7 +2573,6 @@ def prep_partition_for_device(device):
         'size': '8M',
         'flag': 'prep',
         'guid': '9e1a2d38-c612-4316-aa26-8b49521e5a8b',
-        'offset': '1M',
         'wipe': 'zero',
         'grub_device': True,
         'device': device}