diff options
| -rw-r--r-- | iw/partmethod_gui.py | 12 | ||||
| -rw-r--r-- | textw/partmethod_text.py | 9 |
2 files changed, 2 insertions, 19 deletions
diff --git a/iw/partmethod_gui.py b/iw/partmethod_gui.py index e4242e19a..28b999b07 100644 --- a/iw/partmethod_gui.py +++ b/iw/partmethod_gui.py @@ -26,15 +26,10 @@ class PartitionMethodWindow(InstallWindow): def getNext(self): - if self.useFdisk.get_active(): - self.partitions.useAutopartitioning = 0 - self.partitions.useFdisk = 1 - elif self.useAuto.get_active(): + if self.useAuto.get_active(): self.partitions.useAutopartitioning = 1 - self.partitions.useFdisk = 0 else: self.partitions.useAutopartitioning = 0 - self.partitions.useFdisk = 0 return None @@ -60,14 +55,9 @@ class PartitionMethodWindow(InstallWindow): self.useDS = gtk.RadioButton( self.useAuto, _("Manually partition with _Disk Druid")) radioBox.pack_start(self.useDS, gtk.FALSE, gtk.FALSE) - self.useFdisk = gtk.RadioButton( - self.useAuto, _("Manually partition with _fdisk (experts only)")) - radioBox.pack_start(self.useFdisk, gtk.FALSE, gtk.FALSE) if partitions.useAutopartitioning: self.useAuto.set_active(1) - elif partitions.useFdisk: - self.useFdisk.set_active(1) else: self.useDS.set_active(1) diff --git a/textw/partmethod_text.py b/textw/partmethod_text.py index e19530c13..d79ae1bc8 100644 --- a/textw/partmethod_text.py +++ b/textw/partmethod_text.py @@ -25,19 +25,12 @@ class PartitionMethod: _(PARTMETHOD_TYPE_DESCR_TEXT), [ (_("Autopartition"), "auto"), (_("Disk Druid"), "ds"), - (_("fdisk"), "fd"), TEXT_BACK_BUTTON ], + TEXT_BACK_BUTTON ], width = 50, help = "parttool") if rc == TEXT_BACK_CHECK: return INSTALL_BACK - elif rc == "fd": - partitions.useAutopartitioning = 0 - partitions.useFdisk = 1 - elif rc == "ds": - partitions.useAutopartitioning = 0 - partitions.useFdisk = 0 else: partitions.useAutopartitioning = 1 - partitions.useFdisk = 0 return INSTALL_OK |