[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH][rhel6, f15, master] Only apply global passphrase to devices with no passphrase. (#679223)



> diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py
> index ddac09c..ca43673 100644
> --- a/pyanaconda/storage/__init__.py
> +++ b/pyanaconda/storage/__init__.py
> @@ -175,7 +175,8 @@ def storageComplete(anaconda):
>  
>      if anaconda.storage.encryptionPassphrase:
>          for dev in anaconda.storage.devices:
> -            if dev.format.type == "luks" and not dev.format.exists:
> +            if dev.format.type == "luks" and not dev.format.exists and \
> +               not device.format.hasKey:
>                  dev.format.passphrase = anaconda.storage.encryptionPassphrase
>  
>      map(lambda d: anaconda.storage.services.update(d.services),

You'll need a 6.1 blocker bug, but ACK for the other branches.

- Chris


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]