On Fri, 2009-04-24 at 13:29 -0400, Chris Lumens wrote: > --- > storage/__init__.py | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) Looks good. > > diff --git a/storage/__init__.py b/storage/__init__.py > index 8ef305c..08f4cbf 100644 > --- a/storage/__init__.py > +++ b/storage/__init__.py > @@ -130,9 +130,6 @@ def storageComplete(anaconda): > if passphrase: > anaconda.id.storage.encryptionPassphrase = passphrase > anaconda.id.storage.retrofitPassphrase = retrofit > - for dev in anaconda.id.storage.devices: > - if dev.format.type == "luks" and not dev.format.exists: > - dev.format.passphrase = passphrase > break > else: > rc = anaconda.intf.messageWindow(_("Encrypt device?"), > @@ -151,6 +148,11 @@ def storageComplete(anaconda): > anaconda.id.storage.encryptedAutoPart = False > break > > + if anaconda.id.storage.encryptionPassphrase: > + for dev in anaconda.id.storage.devices: > + if dev.format.type == "luks" and not dev.format.exists: > + dev.format.passphrase = anaconda.id.storage.encryptionPassphrase > + > if anaconda.isKickstart: > return > _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list