summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-03-20 12:10:22 +0100
committerSage Weil <sage@inktank.com>2013-04-26 13:40:04 -0700
commit0b4e85fe23e8aa24e8aef8548df2b508bda24752 (patch)
treec39d001e805707f64dde6bd260e12128c9cef6a7
parent3ec61f85f6a8a8af8a2b921f94e77a77be77a1d7 (diff)
downloadceph-0b4e85fe23e8aa24e8aef8548df2b508bda24752.tar.gz
ceph-disk: fix /dev/dm-[0-9] handling list_all_partitions()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 3af7a1ac5bf24bf832d7180002281d6b5853e85a)
-rwxr-xr-xsrc/ceph-disk6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ceph-disk b/src/ceph-disk
index 51479e2a04d..ab7a89321f2 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -133,8 +133,12 @@ def list_all_partitions():
fields = re.split('\s+', line)
if len(fields) < 5:
continue
- (_, major, minor, blocks, name) = fields
+ name = fields[4]
name = '/dev/' + name
+ if "dm-" in name:
+ if "/dev/dm" not in ls:
+ ls["/dev/dm"] = []
+ ls["/dev/dm"].append(name)
if name[-1].isdigit():
base = name
while base[-1].isdigit():