[master/rhel7] fix luksformat references (#1014493)
Brian C. Lane
bcl at redhat.com
Wed Oct 9 21:20:46 UTC 2013
From: "Brian C. Lane" <bcl at redhat.com>
In kickstart part and raid handling of encryption it was using 'format'
instead of kwargs["format"] which resulted in it passing the builtin
python format object instead.
Resolves: rhbz#1014493
---
pyanaconda/kickstart.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 5c07399..a9b749d 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1056,7 +1056,7 @@ class PartitionData(commands.partition.F18_PartData):
cert = getEscrowCertificate(storage.escrowCertificates, self.escrowcert)
if self.onPart:
- luksformat = format
+ luksformat = kwargs["format"]
device.format = getFormat("luks", passphrase=self.passphrase, device=device.path,
cipher=self.cipher,
escrow_cert=cert,
@@ -1213,7 +1213,7 @@ class RaidData(commands.raid.F18_RaidData):
cert = getEscrowCertificate(storage.escrowCertificates, self.escrowcert)
if self.preexist:
- luksformat = format
+ luksformat = kwargs["format"]
device.format = getFormat("luks", passphrase=self.passphrase, device=device.path,
cipher=self.cipher,
escrow_cert=cert,
--
1.8.3.1
More information about the anaconda-patches
mailing list