diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-09-22 04:24:59 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-09-22 04:24:59 +0000 |
| commit | 8974ec2c9659a7e55fe1cbb411ce5e8e61bc7f97 (patch) | |
| tree | 8e62da81e6750fd519590694071a09718feead79 | |
| parent | 9e0ae28741123347b3eec0a365fefdb129fd5445 (diff) | |
| download | drakx-8974ec2c9659a7e55fe1cbb411ce5e8e61bc7f97.tar drakx-8974ec2c9659a7e55fe1cbb411ce5e8e61bc7f97.tar.gz drakx-8974ec2c9659a7e55fe1cbb411ce5e8e61bc7f97.tar.bz2 drakx-8974ec2c9659a7e55fe1cbb411ce5e8e61bc7f97.tar.xz drakx-8974ec2c9659a7e55fe1cbb411ce5e8e61bc7f97.zip | |
silently ignore encrypted filesystems with no encrypt_key
| -rw-r--r-- | perl-install/fs.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 8c790cdec..9f6fc68cf 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -548,6 +548,9 @@ sub mount_part { my $mntpoint = ($o_prefix || '') . $part->{mntpoint}; if (isLoopback($part) || $part->{encrypt_key}) { set_loop($part); + } elsif ($part->{options} =~ /encrypted/) { + log::l("skip mounting $part->{device} since we don't have the encrypt_key"); + return; } elsif (loopback::carryRootLoopback($part)) { $mntpoint = "/initrd/loopfs"; } |