From 0e4cb57bcc52099aeb57a4616c9b93708c596882 Mon Sep 17 00:00:00 2001 From: Dan van der Ster Date: Fri, 12 Dec 2014 12:35:42 +0100 Subject: [PATCH] ceph-disk: fix get_partition_uuid for loop/cciss Loopback and cciss devices have an extra 'p' before the partition number. Add exceptional handling of these devices. Signed-off-by: Dan van der Ster --- src/ceph-disk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ceph-disk b/src/ceph-disk index b96ae9720631f..c1e6e09678ea0 100755 --- a/src/ceph-disk +++ b/src/ceph-disk @@ -2285,7 +2285,10 @@ def get_partition_type(part): def get_partition_uuid(dev): - (base, partnum) = re.match('(\D+)(\d+)', dev).group(1, 2) + if 'loop' in dev or 'cciss' in dev: + (base, partnum) = re.match('(.*\d+)p(\d+)', dev).group(1, 2) + else: + (base, partnum) = re.match('(\D+)(\d+)', dev).group(1, 2) out, _ = command(['sgdisk', '-i', partnum, base]) for line in out.splitlines(): m = re.match('Partition unique GUID: (\S+)', line) -- 2.39.5