diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-09-06 06:53:57 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-09-06 06:53:57 +0000 |
| commit | 86237df0ca5fbcb73bca789f876c9f72bfd49100 (patch) | |
| tree | 43a1734f75f090ef980fc119fd6811b2018856d4 /perl-install/fsedit.pm | |
| parent | 27fb20414e9dc3261fdd57c74833e5075b31542f (diff) | |
| download | drakx-86237df0ca5fbcb73bca789f876c9f72bfd49100.tar drakx-86237df0ca5fbcb73bca789f876c9f72bfd49100.tar.gz drakx-86237df0ca5fbcb73bca789f876c9f72bfd49100.tar.bz2 drakx-86237df0ca5fbcb73bca789f876c9f72bfd49100.tar.xz drakx-86237df0ca5fbcb73bca789f876c9f72bfd49100.zip | |
detect linux software raid magic
Diffstat (limited to 'perl-install/fsedit.pm')
| -rw-r--r-- | perl-install/fsedit.pm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index ddb848e32..3d2565bca 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -63,6 +63,8 @@ sub raids { my @parts = fs::get::hds_fstab(@$hds); my @l = grep { isRawRAID($_) } @parts or return []; + + log::l("looking for raids in " . join(' ', map { $_->{device} } @l)); require raid; raid::detect_during_install(@l) if $::isInstall; @@ -183,8 +185,13 @@ Do you agree to lose all the partitions? # checking the magic of the filesystem, don't rely on pt_type foreach (grep { member($_->{fs_type}, 'vfat', 'ntfs', 'ext2') || $_->{pt_type} == 0x100 } @parts) { - if (my $fs_type = fs::type::fs_type_from_magic($_)) { - $_->{fs_type} = $fs_type; + if (my $type = fs::type::type_subpart_from_magic($_)) { + if ($type->{fs_type}) { + #- keep {pt_type} + $_->{fs_type} = $fs_type; + } else { + put_in_hash($_, $type); + } } else { $_->{bad_fs_type_magic} = 1; } |