From 194116f9cb6951e91413bca21a1898d02cc8b043 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Tue, 1 Mar 2005 15:13:46 +0000
Subject: remember encryption algorithm

---
 perl-install/diskdrake/interactive.pm | 6 +++---
 1 file 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_(
 		       {
-- 
cgit v1.2.1