From cb97338b1186939deecb78e9d949c38c3ef59026 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 18 Jun 2013 16:21:48 -0700 Subject: [PATCH] ceph-disk: handle /dev/foo/bar devices throughout Assume the last component is the unique device name, even if it appears under a subdir of /dev. Signed-off-by: Sage Weil --- src/ceph-disk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ceph-disk b/src/ceph-disk index 13f434882c8d..39fcc4216da0 100755 --- a/src/ceph-disk +++ b/src/ceph-disk @@ -288,7 +288,7 @@ def is_held(dev): """ assert os.path.exists(dev) dev = os.path.realpath(dev) - base = dev[5:] + base = dev.split('/')[-1] # full disk? directory = '/sys/block/{base}/holders'.format(base=base) @@ -2003,7 +2003,7 @@ def is_suppressed(path): try: if not disk.startswith('/dev/') or not stat.S_ISBLK(os.lstat(path).st_mode): return False - base = disk[5:] + base = disk.split('/')[-1] while len(base): if os.path.exists(SUPPRESS_PREFIX + base): return True @@ -2017,7 +2017,7 @@ def set_suppress(path): raise Error('does not exist', path) if not stat.S_ISBLK(os.lstat(path).st_mode): raise Error('not a block device', path) - base = disk[5:] + base = disk.split('/')[-1] with file(SUPPRESS_PREFIX + base, 'w') as f: pass @@ -2030,7 +2030,7 @@ def unset_suppress(path): if not stat.S_ISBLK(os.lstat(path).st_mode): raise Error('not a block device', path) assert disk.startswith('/dev/') - base = disk[5:] + base = disk.split('/')[-1] fn = SUPPRESS_PREFIX + base if not os.path.exists(fn): -- 2.47.3