diff options
| -rw-r--r-- | dispatch.py | 2 | ||||
| -rw-r--r-- | iw/fdisk_gui.py | 7 | ||||
| -rw-r--r-- | textw/fdisk_text.py | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/dispatch.py b/dispatch.py index de18dfc9b..d45fb0e0f 100644 --- a/dispatch.py +++ b/dispatch.py @@ -65,7 +65,7 @@ installSteps = [ ("autopartitionexecute", doAutoPartition, ("dir", "id.diskset", "id.partitions", "intf", "id.instClass")), - ("fdisk", ("id.diskset", "id.partitions")), + ("fdisk", ("id.diskset", "id.partitions", "intf")), ("partition", ("id.fsset", "id.diskset", "id.partitions", "intf")), ("upgrademount", upgradeMountFilesystems, ("intf", "id.upgradeRoot", "id.fsset", "instPath")), diff --git a/iw/fdisk_gui.py b/iw/fdisk_gui.py index 5c2b0e96a..a19c495be 100644 --- a/iw/fdisk_gui.py +++ b/iw/fdisk_gui.py @@ -16,6 +16,7 @@ from iw_gui import * from gnome.zvt import * from translate import _ from dispatch import DISPATCH_NOOP +import partitioning import isys import os @@ -27,7 +28,8 @@ class FDiskWindow (InstallWindow): def getNext(self): # reread partitions - self.diskset.refreshDevices() + self.diskset.refreshDevices(self.intf) + partitioning.checkNoDisks(self.diskset, self.intf) self.partrequests.setFromDisk(self.diskset) return None @@ -78,10 +80,11 @@ class FDiskWindow (InstallWindow): self.ics.setNextEnabled (0) # FDiskWindow tag="fdisk" - def getScreen (self, diskset, partrequests): + def getScreen (self, diskset, partrequests, intf): self.diskset = diskset self.partrequests = partrequests + self.intf = intf self.windowContainer = GtkVBox (FALSE) self.buttonBox = GtkVBox (FALSE, 5) diff --git a/textw/fdisk_text.py b/textw/fdisk_text.py index 1bf9c8157..69f9c13ee 100644 --- a/textw/fdisk_text.py +++ b/textw/fdisk_text.py @@ -20,9 +20,10 @@ import iutil from snack import * from translate import _, cat, N_ from constants_text import * +import partitioning class fdiskPartitionWindow: - def __call__(self, screen, diskset, partrequests): + def __call__(self, screen, diskset, partrequests, intf): choices = [] drives = diskset.disks.keys() drives.sort() @@ -64,7 +65,8 @@ class fdiskPartitionWindow: pass - diskset.refreshDevices() + diskset.refreshDevices(intf) + partitioning.checkNoDisks(diskset, intf) partrequests.setFromDisk(diskset) if button == TEXT_BACK_CHECK: |