Merge ~dbungert/curtin:generic-kname into curtin:master

[Dan Bungert]

block: genericize kname generation

[Michael Hudson-Doyle (mwhudson)]

Not logged in on my phone so can't mark approved but this looks good. If
you could put in a comment and a link to the kernel code that would be even
better :)

On Sat, 30 Jul 2022, 09:22 Dan Bungert, <email address hidden>
wrote:

> Dan Bungert has proposed merging ~dbungert/curtin:generic-kname into
> curtin:master.
>
> Commit message:
> block: genericize kname generation
>
> Requested reviews:
> curtin developers (curtin-dev)
>
> For more details, see:
> https://code.launchpad.net/~dbungert/curtin/+git/curtin/+merge/427643
> --
> You are subscribed to branch curtin:master.
>

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

diff --git a/curtin/block/__init__.py b/curtin/block/__init__.py
index 49b062f..a46c8ec 100644
--- a/curtin/block/__init__.py
+++ b/curtin/block/__init__.py
@@ -132,11 +132,10 @@ def partition_kname(disk_kname, partition_number):
                     os.path.realpath('%s-part%s' % (disk_link,
                                                     partition_number)))
 
-    for dev_type in ['bcache', 'nvme', 'mmcblk', 'cciss', 'mpath', 'md',
-                     'loop']:
-        if disk_kname.startswith(dev_type):
-            partition_number = "p%s" % partition_number
-            break
+    # follow the same rules the kernel check_partition() does
+    # https://github.com/torvalds/linux/blob/0fac198/block/partitions/core.c#L141
+    if disk_kname[-1:].isdigit():
+        partition_number = "p%s" % partition_number
     return "%s%s" % (disk_kname, partition_number)
 
 
diff --git a/tests/unittests/test_block.py b/tests/unittests/test_block.py
index 7a73b69..bb7205e 100644
--- a/tests/unittests/test_block.py
+++ b/tests/unittests/test_block.py
@@ -457,7 +457,11 @@ 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'),
+                       (('asdf7', 3), 'asdf7p3'),
+                       (('zdc', 4), 'zdc4'),
+                       ]
         for ((disk_kname, part_number), part_kname) in part_knames:
             self.assertEqual(part_kname,
                              block.partition_kname(disk_kname, part_number))