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
--
Your team curtin developers is requested to review the proposed merge of
~dbungert/curtin:generic-kname into curtin:master.
diff --git a/curtin/block/__init__.py b/curtin/block/__init__.py
index 49b062f..36f90a4 100644
--- a/curtin/block/__init__.py
+++ b/curtin/block/__init__.py
@@ -132,11 +132,8 @@ 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
+ 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))
--
Mailing list: https://launchpad.net/~curtin-dev
Post to : curtin-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~curtin-dev
More help : https://help.launchpad.net/ListHelp
