summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lehman <dlehman@redhat.com>2012-10-11 18:12:30 -0500
committerDavid Lehman <dlehman@redhat.com>2012-10-15 11:48:22 -0500
commitad3e66d2769e45b92d71a1ead5adf46eba83fe0b (patch)
tree7723463f0ff1bb774883d8b8eaa2fe9f2eb42c15
parent87df4f48be868c489297837dd92f0b44bae467ec (diff)
downloadanaconda-ad3e66d2769e45b92d71a1ead5adf46eba83fe0b.tar.gz
anaconda-ad3e66d2769e45b92d71a1ead5adf46eba83fe0b.tar.xz
anaconda-ad3e66d2769e45b92d71a1ead5adf46eba83fe0b.zip
Add support for specifying encryption cipher mode via kickstart.
Related: rhbz#838736
-rw-r--r--pyanaconda/kickstart.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index d4aa991ab..4c0ef5dad 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -686,6 +686,7 @@ class LogVolData(commands.logvol.F18_LogVolData):
if self.preexist:
luksformat = format
device.format = getFormat("luks", passphrase=self.passphrase, device=device.path,
+ cipher=self.cipher,
escrow_cert=cert,
add_backup_passphrase=self.backuppassphrase)
luksdev = LUKSDevice("luks%d" % storage.nextID,
@@ -694,6 +695,7 @@ class LogVolData(commands.logvol.F18_LogVolData):
else:
luksformat = request.format
request.format = getFormat("luks", passphrase=self.passphrase,
+ cipher=self.cipher,
escrow_cert=cert,
add_backup_passphrase=self.backuppassphrase)
luksdev = LUKSDevice("luks%d" % storage.nextID,
@@ -1061,6 +1063,7 @@ class PartitionData(commands.partition.F18_PartData):
if self.onPart:
luksformat = format
device.format = getFormat("luks", passphrase=self.passphrase, device=device.path,
+ cipher=self.cipher,
escrow_cert=cert,
add_backup_passphrase=self.backuppassphrase)
luksdev = LUKSDevice("luks%d" % storage.nextID,
@@ -1069,6 +1072,7 @@ class PartitionData(commands.partition.F18_PartData):
else:
luksformat = request.format
request.format = getFormat("luks", passphrase=self.passphrase,
+ cipher=self.cipher,
escrow_cert=cert,
add_backup_passphrase=self.backuppassphrase)
luksdev = LUKSDevice("luks%d" % storage.nextID,
@@ -1208,6 +1212,7 @@ class RaidData(commands.raid.F15_RaidData):
if self.preexist:
luksformat = format
device.format = getFormat("luks", passphrase=self.passphrase, device=device.path,
+ cipher=self.cipher,
escrow_cert=cert,
add_backup_passphrase=self.backuppassphrase)
luksdev = LUKSDevice("luks%d" % storage.nextID,
@@ -1216,6 +1221,7 @@ class RaidData(commands.raid.F15_RaidData):
else:
luksformat = request.format
request.format = getFormat("luks", passphrase=self.passphrase,
+ cipher=self.cipher,
escrow_cert=cert,
add_backup_passphrase=self.backuppassphrase)
luksdev = LUKSDevice("luks%d" % storage.nextID,