summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-03-01 15:13:46 +0000
committerOlivier Blin <oblin@mandriva.org>2005-03-01 15:13:46 +0000
commit194116f9cb6951e91413bca21a1898d02cc8b043 (patch)
tree60d4ccfae58dd17ce491b707be2f77c6472a2f6b /perl-install
parent57d57860a81e620db083d6a45ecc32dc3e69da55 (diff)
downloaddrakx-backup-do-not-use-194116f9cb6951e91413bca21a1898d02cc8b043.tar
drakx-backup-do-not-use-194116f9cb6951e91413bca21a1898d02cc8b043.tar.gz
drakx-backup-do-not-use-194116f9cb6951e91413bca21a1898d02cc8b043.tar.bz2
drakx-backup-do-not-use-194116f9cb6951e91413bca21a1898d02cc8b043.tar.xz
drakx-backup-do-not-use-194116f9cb6951e91413bca21a1898d02cc8b043.zip
remember encryption algorithm
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/diskdrake/interactive.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 5ed05a39e..bd2e34cb4 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -948,7 +948,7 @@ sub Options {
if (!check($in, $hd, $part, $all_hds)) {
$options->{encrypted} = 0;
} elsif (!$part->{encrypt_key} && !isSwap($part)) {
- if (my ($encrypt_key, $encrypt_algo) = choose_encrypt_key($in)) {
+ if (my ($encrypt_key, $encrypt_algo) = choose_encrypt_key($in, $options)) {
$options->{'encryption='} = $encrypt_algo;
$part->{encrypt_key} = $encrypt_key;
} else {
@@ -1257,11 +1257,11 @@ sub min_partition_size { $_[0]->cylinder_size + 2*$_[0]{geom}{sectors} }
sub choose_encrypt_key {
- my ($in) = @_;
+ my ($in, $options) = @_;
my ($encrypt_key, $encrypt_key2);
my @algorithms = map { "AES$_" } 128, 196, 256, 512, 1024, 2048;
- my $encrypt_algo = "AES128";
+ my $encrypt_algo = $options->{'encryption='} || "AES128";
$in->ask_from_(
{