diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-09-17 14:29:36 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-09-17 14:29:36 +0000 |
| commit | f82fc8f6d7f9748818e78f7bbcc310ba04475d4f (patch) | |
| tree | 518666e2499a7b891b72dd05c3215830e25b76eb /perl-install/diskdrake | |
| parent | b598cc4c8d164c3ab798225ea2ea3910e01c092b (diff) | |
| download | drakx-f82fc8f6d7f9748818e78f7bbcc310ba04475d4f.tar drakx-f82fc8f6d7f9748818e78f7bbcc310ba04475d4f.tar.gz drakx-f82fc8f6d7f9748818e78f7bbcc310ba04475d4f.tar.bz2 drakx-f82fc8f6d7f9748818e78f7bbcc310ba04475d4f.tar.xz drakx-f82fc8f6d7f9748818e78f7bbcc310ba04475d4f.zip | |
simplify: choose_encrypt_key() does *not* modify $options, and
$part->{encrypt_key} is not used in fs::mount_options::pack()
Diffstat (limited to 'perl-install/diskdrake')
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 25744cfab..64fe5a83b 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -1094,9 +1094,8 @@ sub ensure_we_have_encrypt_key_if_needed { my ($in, $part) = @_; if ($part->{options} =~ /encrypted/ && !$part->{encrypt_key}) { - my ($options, $unknown) = fs::mount_options::unpack($part); + my ($options, $_unknown) = fs::mount_options::unpack($part); $part->{encrypt_key} = choose_encrypt_key($in, $options, 'skip_encrypt_algo') or return; - fs::mount_options::pack($part, $options, $unknown); } 1; } |