Merge pull request #7176: ceph-disk prepare fails if device is a symlink

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Jan 11, 2016 · 472dce6 · 472dce6
2 parents 830c69f + b2f1e76
commit 472dce6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/ceph-disk b/src/ceph-disk
@@ -996,9 +996,9 @@ def get_free_partition_index(dev):
         'BYT;' not in lines):
         raise Error('parted output expected to contain one of ' +
                     'CHH; CYL; or BYT; : ' + lines)
-    if dev not in lines:
+    if os.path.realpath(dev) not in lines:
         raise Error('parted output expected to contain ' + dev + ': ' + lines)
-    _, partitions = lines.split(dev)
+    _, partitions = lines.split(os.path.realpath(dev))
     partition_numbers = extract_parted_partition_numbers(partitions)
     if partition_numbers:
         return max(partition_numbers) + 1