[PATCH 2/2] Set both .format's and .originalFormat's passphrase on unlock

Vratislav Podzimek vpodzime at redhat.com
Mon Apr 13 06:18:41 UTC 2015


On Fri, 2015-04-10 at 16:40 +0200, Vratislav Podzimek wrote:
> If the device is reused for the installation, blivet uses the originalFormat
> object to setup the device. Thus we need to set the passphrase in both places.
> 
> Related: rhbz#1210254
> Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
> ---
>  pyanaconda/ui/gui/spokes/custom.py | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
> index 5a7215f..f6f05c4 100644
> --- a/pyanaconda/ui/gui/spokes/custom.py
> +++ b/pyanaconda/ui/gui/spokes/custom.py
> @@ -2668,6 +2668,9 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
>                                 "<a href=\"\">Click for details.</a>"))
>              return
>  
> +        # set the passphrase also to the originalFormat of the device (a
> +        # different object than '.format', but the same contents)
> +        device.originalFormat.passphrase = passphrase
>          log.info("unlocked %s, now going to populate devicetree...", device.name)
>          with ui_storage_logger():
>              luks_dev = LUKSDevice(device.format.mapName,
I just realized we have a separate bug report (accepted F22 Beta FE) for
this -- https://bugzilla.redhat.com/show_bug.cgi?id=1208979
I'll update the commit message before pushing.

-- 
Vratislav Podzimek

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



More information about the anaconda-patches mailing list