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

Vratislav Podzimek vpodzime at redhat.com
Thu Oct 10 10:21:09 UTC 2013


On Wed, 2013-10-09 at 14:00 -0400, mulhern wrote:
> Resolves: #966510
> 
> Note: This change is the same as for bug #1017330, but in Fedora.
> 
> 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 12e8ebd..c1a4686 100644
> --- a/pyanaconda/ui/gui/spokes/storage.py
> +++ b/pyanaconda/ui/gui/spokes/storage.py
> @@ -853,11 +853,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):
> @@ -877,9 +876,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
This looks good to me.

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list