From c3c070a106de6a7d46ec52dbda505a7b820f4bbb Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 1 Jul 2005 06:59:30 +0000 Subject: move skipping dmraid drives test in fsedit (and use fs::type::is_dmraid) --- perl-install/fs/proc_partitions.pm | 2 -- perl-install/fsedit.pm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/perl-install/fs/proc_partitions.pm b/perl-install/fs/proc_partitions.pm index 90cd2fa7b..1cb3acfd1 100644 --- a/perl-install/fs/proc_partitions.pm +++ b/perl-install/fs/proc_partitions.pm @@ -59,8 +59,6 @@ sub read { sub compare { my ($hd) = @_; - $hd->{bus} =~ /^dmraid_/ and log::l("skipping /proc/partititions check for dmraid $hd->{device}"), return; - my @l1 = partition_table::get_normal_parts($hd); my @l2 = grep { $_->{rootDevice} eq $hd->{device} } &read([$hd]); diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 71522fbff..241354563 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -190,7 +190,7 @@ sub get_hds { if (listlength(partition_table::get_normal_parts($hd)) == 0) { $handled = 1 if $handle_die_and_cdie->(); } else { - fs::proc_partitions::compare($hd) if $::isInstall; + fs::proc_partitions::compare($hd) if !fs::type::is_dmraid($hd) && $::isInstall; } } sub { my $err = $@; -- cgit v1.2.1