summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-03-06 20:46:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-03-06 20:46:08 +0000
commit4f9917cec31b1dc2b4e070a0ef369b668f13aaa6 (patch)
tree3572d1086471a4626e692d9064b970db5d266469
parent4393846e9e365f2a32a9890a540b7a76251ff801 (diff)
downloaddrakx-4f9917cec31b1dc2b4e070a0ef369b668f13aaa6.tar
drakx-4f9917cec31b1dc2b4e070a0ef369b668f13aaa6.tar.gz
drakx-4f9917cec31b1dc2b4e070a0ef369b668f13aaa6.tar.bz2
drakx-4f9917cec31b1dc2b4e070a0ef369b668f13aaa6.tar.xz
drakx-4f9917cec31b1dc2b4e070a0ef369b668f13aaa6.zip
basic encrypt_key handling in upgrade (don't mistype!)
-rw-r--r--perl-install/install_steps_interactive.pm5
1 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d8e6b9724..095329b74 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -153,6 +153,11 @@ sub selectInstallClass {
my $part = $p->{part};
log::l("choosing to upgrade partition $part->{device}");
install_any::use_root_part($o->{all_hds}, $part, $o->{prefix});
+ foreach (grep { $_->{mntpoint} } @{$o->{fstab}}) {
+ my ($options, $unknown) = fs::mount_options_unpack($_);
+ $options->{encrypted} or next;
+ $_->{encrypt_key} = $o->ask_from_entry('', N("Encryption key for %s", $_->{mntpoint}));
+ }
$o->{isUpgrade} = 1;
}
}