diff options
| author | Erik Troan <ewt@redhat.com> | 1999-09-24 01:11:23 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@redhat.com> | 1999-09-24 01:11:23 +0000 |
| commit | 581e239731878059afd3fa0b6dafc094340518c4 (patch) | |
| tree | 0ca08b6413dd7a06911891b224f54ec5f01bf337 /iw | |
| parent | 13486548b2811d394c9fbfde059a8ecfcf531e9a (diff) | |
| download | anaconda-581e239731878059afd3fa0b6dafc094340518c4.tar.gz anaconda-581e239731878059afd3fa0b6dafc094340518c4.tar.xz anaconda-581e239731878059afd3fa0b6dafc094340518c4.zip | |
manual partitioning behaves properly
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/fdisk.py | 16 | ||||
| -rw-r--r-- | iw/installpath.py | 9 | ||||
| -rw-r--r-- | iw/rootpartition.py | 1 |
3 files changed, 25 insertions, 1 deletions
diff --git a/iw/fdisk.py b/iw/fdisk.py index be6e60fde..21fd66921 100644 --- a/iw/fdisk.py +++ b/iw/fdisk.py @@ -24,6 +24,20 @@ class FDiskWindow (InstallWindow): self.ics.setNextEnabled (1) self.ics.setHelpEnabled (1) + def getNext(self): + from gnomepyfsedit import fsedit + drives = self.todo.drives.available ().keys () + drives.sort (isys.compareDrives) + + fstab = [] + for mntpoint, (dev, fstype, reformat) in self.todo.mounts.items (): + fstab.append ((dev, mntpoint)) + + print "fstab", fstab + + self.todo.ddruid = fsedit(0, drives, fstab, self.todo.zeroMbr) + return None + def button_clicked (self, widget, drive): zvt = ZvtTerm (80, 24) zvt.connect ("child_died", self.child_died, widget) @@ -75,4 +89,6 @@ class FDiskWindow (InstallWindow): self.buttonBox.pack_start (box, FALSE) self.windowContainer.pack_start (self.buttonBox) + self.ics.setNextEnabled (1) + return self.windowContainer diff --git a/iw/installpath.py b/iw/installpath.py index bde7d2e9c..792f4a2dd 100644 --- a/iw/installpath.py +++ b/iw/installpath.py @@ -205,7 +205,14 @@ class InstallPathWindow (InstallWindow): if self.todo.expert: hbox = GtkHBox (FALSE) - InstallPathWindow.fdisk = GtkCheckButton (_("Use fdisk")) + if not InstallPathWindow.__dict__.has_key("fdisk"): + fdiskState = 0 + else: + fdiskState = InstallPathWindow.fdisk.get_active() + + InstallPathWindow.fdisk = GtkCheckButton (_("Use fdisk")) + InstallPathWindow.fdisk.set_active(fdiskState) + align = GtkAlignment () align.add (InstallPathWindow.fdisk) align.set (0.0, 0.0, 0.0, 0.0) diff --git a/iw/rootpartition.py b/iw/rootpartition.py index ae564ac16..4c8eab044 100644 --- a/iw/rootpartition.py +++ b/iw/rootpartition.py @@ -155,6 +155,7 @@ class AutoPartitionWindow(InstallWindow): if (InstallPathWindow.fdisk and InstallPathWindow.fdisk.get_active ()): + self.todo.manuallyPartition() return None # XXX hack |