summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--textw/partition_text.py16
2 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e142eb78..f9e0dafa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-27 David Cantrell <dcantrell@redhat.com>
+
+ * textw/partition_text.py (PartitionTypeWindow): Skip partition
+ and bootloader screens if user doesn't want to review partition
+ layout (#178739).
+
2006-01-26 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version
diff --git a/textw/partition_text.py b/textw/partition_text.py
index 1524d3017..1be847730 100644
--- a/textw/partition_text.py
+++ b/textw/partition_text.py
@@ -1598,13 +1598,21 @@ class PartitionTypeWindow:
if queryAutoPartitionOK(intf, diskset, partitions):
break
+ # ask to review autopartition layout
+ reviewLayout = dispatch.intf.messageWindow(_("Review Partition Layout"),
+ _("Review and modify partitioning layout?"),
+ type = "yesno")
+
+ if reviewLayout == 1:
+ dispatch.skipStep("partition", skip = 0)
+ dispatch.skipStep("bootloader", skip = 0)
+ else:
+ dispatch.skipStep("partition", skip = 1)
+ dispatch.skipStep("bootloader", skip = 1)
+
self.shutdownUI()
screen.popWindow()
- # XXX we always unskip disk druid in tui right now since
- # we don't ask if you want to review amd if you're using
- # text mode, we hope you're smart enough to deal (#82474)
- dispatch.skipStep("partition", skip = 0)
return INSTALL_OK