use new fsedit code for text mode

1 files changed, 11 insertions, 25 deletions

diff --git a/text.py b/text.py
index 45f1f0b4a..ad1df2c05 100644
--- a/text.py
+++ b/text.py
@@ -206,35 +206,21 @@ class NetworkWindow:
 
 class PartitionWindow:
     def run(self, screen, todo):
- 	if (not todo.setupFilesystems): return INSTALL_NOOP
+# 	if (not todo.setupFilesystems): return INSTALL_NOOP
 
-        dev = "hda"
+        sys.path.append('libfdisk')
+        from newtpyfsedit import fsedit        
 
-	isys.makeDevInode (dev, "/tmp/" + dev)
-	device = parted.device_read ("/tmp/" + dev)
-	os.remove("/tmp/" + dev)
-
-        keys = device.partitions.keys()
-        keys.sort()
-
-        partList = []
-	for key in keys:
-            partition = device.partitions[key]
-	    if (partition.sys_type == 0x83):
-		fullName = "%s%d" % (dev, key)
-		partList.append((fullName, fullName))
-
-	rc = ListboxChoiceWindow(screen, _("Root Partition"),
-				 _("What partition would you "
-				 "like to use for your root partition?"),
-				 partList, buttons = [_("OK"), _("Back")])
-
-	if rc[0] == string.lower(_("Back")):
-	    return INSTALL_BACK
+        fstab = []
+        for (dev, dir, reformat) in todo.mounts:
+            fstab.append ((dev, dir))
+        
+        (dir, res) = fsedit(1, ['hda'], fstab)
 
-	todo.addMount(rc[1], "/")
+        for (partition, mount, size) in res:
+            todo.addMount(partition, mount)
 
-        return INSTALL_OK
+        return dir
 
 class PackageGroupWindow:
     def run(self, screen, todo, individual):