diff options
author | Sage Weil <sage@inktank.com> | 2013-03-04 16:08:15 -0800 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-03-04 16:08:15 -0800 |
commit | 59505546e52a175435881b431bd349d532ae627e (patch) | |
tree | 7a4af0db6103e1e54782c557e510a914baf43251 | |
parent | 2a7e802d69ba6364c14070c66773b63a1f48b67c (diff) | |
download | ceph-59505546e52a175435881b431bd349d532ae627e.tar.gz |
ceph-disk-prepare: use os.path.realpath()
My janky symlink resolution is broken in various ways.
Signed-off-by: Sage Weil <sage@inktank.com>
-rwxr-xr-x | src/ceph-disk-prepare | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/ceph-disk-prepare b/src/ceph-disk-prepare index b0f003b6e5c..0eca7c0cafb 100755 --- a/src/ceph-disk-prepare +++ b/src/ceph-disk-prepare @@ -75,13 +75,7 @@ def is_partition(dev): """ Check whether a given device is a partition or a full disk. """ - # resolve symlink(s) - max = 10 - while stat.S_ISLNK(os.lstat(dev).st_mode): - dev = os.readlink(dev) - max -= 1 - if max == 0: - raise PrepareError('%s is a rats nest of symlinks' % dev) + dev = os.path.realpath(dev) if not stat.S_ISBLK(os.lstat(dev).st_mode): raise PrepareError('not a block device', dev) |