summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-07-24 14:46:24 -0700
committerSage Weil <sage@inktank.com>2013-07-24 15:46:59 -0700
commit24a56a9637afd8c64b71d264359c78a25d52be02 (patch)
tree14cd876cce61d8573e3379939d0bc8a24378ae73
parent1f8e4b15eeb132fd7f389318009b19f8f13adbf5 (diff)
downloadceph-24a56a9637afd8c64b71d264359c78a25d52be02.tar.gz
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> (cherry picked from commit fd1fd664d6102a2a96b27e8ca9933b54ac626ecb)
-rwxr-xr-xsrc/ceph-disk8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ceph-disk b/src/ceph-disk
index db988b0d5e3..b4a9e68dad7 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)
###########################