summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-09-06 08:28:03 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-09-06 08:28:03 +0000
commit9ae2f92117954eae8ce5a07889069631c48fb49a (patch)
tree448db195e417d9cc4f17563407d5f4aed81cab34
parent866c6abb0bd3eb803e9111b510afd62b23fa790f (diff)
downloaddrakx-9ae2f92117954eae8ce5a07889069631c48fb49a.tar
drakx-9ae2f92117954eae8ce5a07889069631c48fb49a.tar.gz
drakx-9ae2f92117954eae8ce5a07889069631c48fb49a.tar.bz2
drakx-9ae2f92117954eae8ce5a07889069631c48fb49a.tar.xz
drakx-9ae2f92117954eae8ce5a07889069631c48fb49a.zip
- detect LVM2
- don't even check_md magic when we don't have the size of the device
-rw-r--r--perl-install/fs/type.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 70ca967bf..0b361b8f2 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -250,6 +250,7 @@ sub set_type_subpart {
my @partitions_signatures = (
+ (map { [ 'Linux Logical Volume Manager', 0x200 * $_ + 0x18, "LVM2" ] } 0 .. 3),
[ 'Linux Logical Volume Manager', 0, "HM\1\0" ],
[ 'ext2', 0x438, "\x53\xEF" ],
[ 'reiserfs', 0x10034, "ReIsErFs" ],
@@ -292,7 +293,7 @@ sub type_subpart_from_magic {
'';
};
my $t = typeFromMagic($dev,
- $check_md,
+ if_($part->{size}, $check_md),
@partitions_signatures) or return;
my $p = type_name2subpart($t) || fs_type2subpart($t) || internal_error("unknown name/fs $t");