[PATCH 08/12] Update autopart and encryption settings in the reclaim path.

David Lehman dlehman at redhat.com
Thu Oct 4 22:10:12 UTC 2012


---
 pyanaconda/ui/gui/spokes/storage.py |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index 08da289..ca95e78 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -349,7 +349,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             self.data.clearpart.type = CLEARPART_TYPE_NONE
             self.data.clearpart.initAll = False
             self.storage.config.update(self.data)
-            self.storage.autoPartType = self.data.clearpart.type
+            self.storage.autoPartType = self.data.autopart.type
             self.storage.reset()
         else:
             if self.autopart:
@@ -613,6 +613,13 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             # go to software spoke
             print "user chose to modify software selection"
         elif rc == dialog.RESPONSE_RECLAIM:
+            self.autopart = not dialog.custom
+
+            # even if they're not doing autopart, setting autopart.encrypted
+            # establishes a default of encrypting new devices
+            encrypt_button = self.builder.get_object("encryption_checkbutton")
+            self.encrypted = encrypt_button.get_active()
+
             if dialog.custom:
                 self.skipTo = "CustomPartitioningSpoke"
             else:
-- 
1.7.7.6



More information about the anaconda-patches mailing list