From: Loic Dachary <ldachary@redhat.com>
Date: Sun, 20 Sep 2015 12:12:25 +0000 (+0200)
Subject: ceph-disk: make ceph-disk list /dev/vdb equivalent to list vdb
X-Git-Tag: v9.1.0~89^2^2~15
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3d0e7ca6cbd18bb19e3a9357db7bc5cb3f6f2f1a;p=ceph.git

ceph-disk: make ceph-disk list /dev/vdb equivalent to list vdb

The ceph-disk list argument must be the device name without the leading
/dev/. This is error prone and silently does nothing. Strip the /dev/
prefix of ceph-disk list arguments so that it behaves as expected.

http://tracker.ceph.com/issues/13154 Fixes: #13154

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 70fe4238af2ff..d8f67ce615c74 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -534,7 +534,9 @@ def list_all_partitions(names):
     """
     Return a list of devices and partitions
     """
-    if not names:
+    if names:
+        names = map(lambda x: re.sub('^/dev/', '', x), names)
+    else:
         names = os.listdir('/sys/block')
     dev_part_list = {}
     for name in names: