summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-07-01 06:59:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-07-01 06:59:30 +0000
commitc3c070a106de6a7d46ec52dbda505a7b820f4bbb (patch)
tree4cba60d80c75bdfdb6151a2c2823159a516788e0
parentb702e1e4814dd994c2094d72b5acbdf5e2b4d796 (diff)
downloaddrakx-c3c070a106de6a7d46ec52dbda505a7b820f4bbb.tar
drakx-c3c070a106de6a7d46ec52dbda505a7b820f4bbb.tar.gz
drakx-c3c070a106de6a7d46ec52dbda505a7b820f4bbb.tar.bz2
drakx-c3c070a106de6a7d46ec52dbda505a7b820f4bbb.tar.xz
drakx-c3c070a106de6a7d46ec52dbda505a7b820f4bbb.zip
move skipping dmraid drives test in fsedit (and use fs::type::is_dmraid)
-rw-r--r--perl-install/fs/proc_partitions.pm2
-rw-r--r--perl-install/fsedit.pm2
2 files changed, 1 insertions, 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 = $@;