From: Sage Weil <sage@inktank.com>
Date: Wed, 24 Jul 2013 21:46:24 +0000 (-0700)
Subject: ceph-disk: use new get_dev_path helper for list
X-Git-Tag: v0.67-rc2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd1fd664d6102a2a96b27e8ca9933b54ac626ecb;p=ceph.git

ceph-disk: use new get_dev_path helper for list

Backport: cuttlefish
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
Tested-by: Olivier Bonvalet <ob.ceph@daevel.fr>
---

diff --git a/src/ceph-disk b/src/ceph-disk
index db988b0d5e34..b4a9e68dad75 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1960,7 +1960,7 @@ def main_list(args):
     journal_map = {}
     for base, parts in sorted(partmap.iteritems()):
         for p in parts:
-            dev = '/dev/' + p
+            dev = get_dev_path(p)
             part_uuid = get_partition_uuid(dev)
             if part_uuid:
                 uuid_map[part_uuid] = dev
@@ -1980,11 +1980,11 @@ def main_list(args):
 
     for base, parts in sorted(partmap.iteritems()):
         if parts:
-            print '/dev/%s :' % base
+            print '%s :' % get_dev_path(base)
             for p in sorted(parts):
-                list_dev('/dev/' + p, uuid_map, journal_map)
+                list_dev(get_dev_path(p), uuid_map, journal_map)
         else:
-            list_dev('/dev/' + base, uuid_map, journal_map)
+            list_dev(get_dev_path(base), uuid_map, journal_map)
 
 
 ###########################