diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-09-18 17:00:11 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-09-18 17:00:11 +0000 |
| commit | 562c8c525f7b9bf005c56e589623817a19e23438 (patch) | |
| tree | 86a8d5a18b187918d962eb78bed852c75f0cded3 /perl-install/fs.pm | |
| parent | 8d97f13366221db1ec0b8400dac8fb9c26180621 (diff) | |
| download | drakx-562c8c525f7b9bf005c56e589623817a19e23438.tar drakx-562c8c525f7b9bf005c56e589623817a19e23438.tar.gz drakx-562c8c525f7b9bf005c56e589623817a19e23438.tar.bz2 drakx-562c8c525f7b9bf005c56e589623817a19e23438.tar.xz drakx-562c8c525f7b9bf005c56e589623817a19e23438.zip | |
- diskdrake:
o handle partitions encrypted with cryptsetup
Diffstat (limited to 'perl-install/fs.pm')
| -rw-r--r-- | perl-install/fs.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm index a5b24edab..0025583c9 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -228,7 +228,7 @@ sub prepare_write_fstab { my ($freq, $passno) = exists $_->{freq} ? ($_->{freq}, $_->{passno}) : - isTrueLocalFS($_) && $_->{options} !~ /encryption=/ && (!$_->{is_removable} || member($_->{mntpoint}, fs::type::directories_needed_to_boot())) ? + isTrueLocalFS($_) && !$_->{dmcrypt_name} && $_->{options} !~ /encryption=/ && (!$_->{is_removable} || member($_->{mntpoint}, fs::type::directories_needed_to_boot())) ? (1, $_->{mntpoint} eq '/' ? 1 : fs::type::carry_root_loopback($_) ? 0 : 2) : (0, 0); @@ -293,6 +293,7 @@ sub write_fstab { my ($s, $smb_credentials) = prepare_write_fstab($fstab, $o_prefix, ''); output("$o_prefix/etc/fstab", $s); fs::remote::smb::save_credentials($_) foreach @$smb_credentials; + fs::dmcrypt::save_crypttab($all_hds) if @{$all_hds->{dmcrypts}}; } sub set_removable_mntpoints { |