[PATCH] Only prompt for LUKS password if the user has chosen to configure automatically.

mulhern amulhern at redhat.com
Wed Oct 9 17:45:35 UTC 2013


Resolves #1017330

If the user has chosen any other action then they will be prompted for a
LUKS password after they complete that action.

In the case where they RECLAIM space on the disk they won't be prompted for
a password before they return to installation summary,
but they won't be done either, so they will have to return to storage
to complete.

If they cancel or quit there is no point in prompting them for a password,
because they have made no changes.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 pyanaconda/ui/gui/spokes/storage.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index ab50072..82b9e32 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -826,11 +826,10 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             self.autoPartType = dialog.autoPartType
             self.encrypted = dialog.encrypted
 
-            if not self._check_encrypted():
-                return
-
             if dialog.continue_response == dialog.RESPONSE_CONTINUE_AUTOPART:
                 self.autopart = True
+                if not self._check_encrypted():
+                    return
             elif dialog.continue_response == dialog.RESPONSE_CONTINUE_RECLAIM:
                 self.apply()
                 if not self._show_resize_dialog(disks):
@@ -850,9 +849,6 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             self.autoPartType = dialog.autoPartType
             self.encrypted = dialog.encrypted
 
-            if not self._check_encrypted():
-                return
-
             self.apply()
             if not self._show_resize_dialog(disks):
                 # User pressed cancel on the reclaim dialog, so don't leave
-- 
1.8.3.1



More information about the anaconda-patches mailing list