balkan go bye-bye (51888)

1 files changed, 13 insertions, 13 deletions

diff --git a/raid.py b/raid.py
index f982502e7..061209d44 100644
--- a/raid.py
+++ b/raid.py
@@ -14,11 +14,10 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-# XXX partedify
-
-import _balkan
+import parted
 import isys
 import os
+import partitioning
 from log import log
 
 def scanForRaid(drives):
@@ -26,19 +25,20 @@ def scanForRaid(drives):
     raidDevices = {}
 
     for d in drives:
+        parts = []
 	isys.makeDevInode(d, "/tmp/" + d)
-	try:
-	    parts = _balkan.readTable('/tmp/' + d)
-	except SystemError, msg:
-	    parts = []
-
-	os.remove("/tmp/" + d)
-	for i in range(0, len(parts)):
-	    (type, start, size) = parts[i]
-	    if type != _balkan.RAID: continue
+        try:
+            dev = parted.PedDevice.get("/tmp/" + d)
+            disk = parted.PedDisk.open(dev)
 
-	    dev = "%s%d" % (d, i + 1)
+            raidParts = partitioning.get_raid_partitions(disk)
+            for part in raidParts:
+                parts.append(partitioning.get_partition_name(part))
+        except:
+            pass
 
+	os.remove("/tmp/" + d)
+        for dev in parts:
             try:
                 (major, minor, raidSet, level, nrDisks, totalDisks, mdMinor) =\
                         isys.raidsb(dev)