Merge ~dbungert/curtin:pmem into curtin:master

[Dan Bungert]

block_meta: fix for pmem kname lookup

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

FAILED: Continuous integration, rev:2706b812d8cdf8015218e5b2509418d17d0613b1
https://jenkins.canonical.com/server-team/job/curtin-ci/22/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/22/
    FAILURE: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/22/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/22/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/22/

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

review: Needs Fixing (continuous-integration)

[Michael Hudson-Doyle (mwhudson)]

I went and found the logic in the kernel that decides whether a partition gets a p and it's way simpler than what we do in curtin: https://github.com/torvalds/linux/blob/master/block/partitions/core.c#L141. We should make our logic simpler too :)

[Dan Bungert (dbungert)]

Alternate implementation
https://code.launchpad.net/~dbungert/curtin/+git/curtin/+merge/427643

Unmerged commits

2706b81... by Dan Bungert on 2022-07-27

block_meta: fix for pmem kname lookup

diff --git a/curtin/block/__init__.py b/curtin/block/__init__.py
index 49b062f..8510a01 100644
--- a/curtin/block/__init__.py
+++ b/curtin/block/__init__.py
@@ -133,7 +133,7 @@ def partition_kname(disk_kname, partition_number):
                                                     partition_number)))
 
     for dev_type in ['bcache', 'nvme', 'mmcblk', 'cciss', 'mpath', 'md',
-                     'loop']:
+                     'loop', 'pmem']:
         if disk_kname.startswith(dev_type):
             partition_number = "p%s" % partition_number
             break
diff --git a/tests/unittests/test_block.py b/tests/unittests/test_block.py
index 7a73b69..9dff854 100644
--- a/tests/unittests/test_block.py
+++ b/tests/unittests/test_block.py
@@ -457,7 +457,10 @@ class TestBlockKnames(CiTestCase):
                        (('cciss!c0d0', 1), 'cciss!c0d0p1'),
                        (('dm-0', 1),  'dm-1'),
                        (('md0', 1), 'md0p1'),
-                       (('mpath1', 2), 'mpath1p2')]
+                       (('mpath1', 2), 'mpath1p2'),
+                       (('pmem0', 1), 'pmem0p1'),
+                       ]
+
         for ((disk_kname, part_number), part_kname) in part_knames:
             self.assertEqual(part_kname,
                              block.partition_kname(disk_kname, part_number))