summaryrefslogtreecommitdiffstats
path: root/perl-install/fs
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2012-04-23 23:33:00 +0000
committerPascal Terjan <pterjan@mageia.org>2012-04-23 23:33:00 +0000
commiteca86ee951a05c35bcfddba4f8988c2f0e23004f (patch)
treea4ec04d3b40d3d91449c57b445890e49400fc716 /perl-install/fs
parentd37e1274a8553c201cc69e6865d51ebeb303fa49 (diff)
downloaddrakx-eca86ee951a05c35bcfddba4f8988c2f0e23004f.tar
drakx-eca86ee951a05c35bcfddba4f8988c2f0e23004f.tar.gz
drakx-eca86ee951a05c35bcfddba4f8988c2f0e23004f.tar.bz2
drakx-eca86ee951a05c35bcfddba4f8988c2f0e23004f.tar.xz
drakx-eca86ee951a05c35bcfddba4f8988c2f0e23004f.zip
detect LVM on top on Encrypted partitions (mga#5330)
Diffstat (limited to 'perl-install/fs')
-rw-r--r--perl-install/fs/dmcrypt.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/fs/dmcrypt.pm b/perl-install/fs/dmcrypt.pm
index ae0f71714..a0f5b6559 100644
--- a/perl-install/fs/dmcrypt.pm
+++ b/perl-install/fs/dmcrypt.pm
@@ -127,8 +127,10 @@ sub _get_existing_one {
put_in_hash($part, $type);
}
fs::type::set_isFormatted($part, to_bool($part->{fs_type}));
-
- $part->{fs_type} or fs::type::set_fs_type($part, defaultFS());
+
+ unless (fs::type::cannotBeMountable($part)) {
+ $part->{fs_type} or fs::type::set_fs_type($part, defaultFS());
+ }
log::l("dmcrypt: found $part->{device} type $part->{fs_type} with rootDevice $part->{rootDevice}");