summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Troan <ewt@redhat.com>1999-09-24 01:01:05 +0000
committerErik Troan <ewt@redhat.com>1999-09-24 01:01:05 +0000
commit13486548b2811d394c9fbfde059a8ecfcf531e9a (patch)
tree3356ad396cd5e647b12735845b9f8d4af9f0adf3
parent7bb01ebd26499c4034c2d126a2d5b01fb326b5c9 (diff)
downloadanaconda-13486548b2811d394c9fbfde059a8ecfcf531e9a.tar.gz
anaconda-13486548b2811d394c9fbfde059a8ecfcf531e9a.tar.xz
anaconda-13486548b2811d394c9fbfde059a8ecfcf531e9a.zip
1) don't let fdisk users use auto paritioning as well
2) the fdisk screen blows away the existing fdisk widget each time
-rw-r--r--iw/fdisk.py2
-rw-r--r--iw/rootpartition.py5
2 files changed, 7 insertions, 0 deletions
diff --git a/iw/fdisk.py b/iw/fdisk.py
index 0876e43f1..be6e60fde 100644
--- a/iw/fdisk.py
+++ b/iw/fdisk.py
@@ -56,6 +56,8 @@ class FDiskWindow (InstallWindow):
(not InstallPathWindow.fdisk.get_active ())):
return None
+ self.ddruid = None
+
self.windowContainer = GtkVBox (FALSE)
self.buttonBox = GtkVBox (FALSE, 5)
self.buttonBox.set_border_width (5)
diff --git a/iw/rootpartition.py b/iw/rootpartition.py
index d0b990083..ae564ac16 100644
--- a/iw/rootpartition.py
+++ b/iw/rootpartition.py
@@ -151,6 +151,11 @@ class AutoPartitionWindow(InstallWindow):
def getScreen (self):
from gnomepyfsedit import fsedit
+ from installpath import InstallPathWindow
+
+ if (InstallPathWindow.fdisk and
+ InstallPathWindow.fdisk.get_active ()):
+ return None
# XXX hack
if self.todo.instClass.clearType: