summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-10 22:01:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-10 22:01:20 +0000
commit90b7b7f7a18d0d319757bee4a5568f9d719655de (patch)
tree56dc23954913a8a1c5f6eb1c74be1718e1a0ab59
parent9fa119e54bb2d23b4806d8aebf053d6ce3dfde42 (diff)
downloaddrakx-90b7b7f7a18d0d319757bee4a5568f9d719655de.tar
drakx-90b7b7f7a18d0d319757bee4a5568f9d719655de.tar.gz
drakx-90b7b7f7a18d0d319757bee4a5568f9d719655de.tar.bz2
drakx-90b7b7f7a18d0d319757bee4a5568f9d719655de.tar.xz
drakx-90b7b7f7a18d0d319757bee4a5568f9d719655de.zip
ck hptraid, but discard the insmod error for it
-rw-r--r--kernel/list_modules.pm2
-rw-r--r--perl-install/modules.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index cb0080bd1..da93d4834 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -74,7 +74,7 @@ our %l = (
if_(arch() =~ /^sparc/, qw(pluto)),
if_(arch() !~ /alpha/ && arch() !~ /sparc/,
qw(DAC960 dpt_i2o megaraid aacraid ataraid cciss cpqarray gdth i2o_block),
- qw(cpqfc qla2200 qla2300),
+ qw(cpqfc qla2200 qla2300 hptraid),
qw(ips ppa imm),
),
],
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 314b572ee..764575341 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -95,6 +95,8 @@ sub load_category {
eval { load([ $_->{driver}, $_->{options} ]) };
$_->{error} = $@;
+ $_->{try} = 1 if $_->{driver} eq 'hptraid';
+
!($_->{error} && $_->{try});
} probe_category($category, $probe_type),
map { { driver => $_, description => $_, try => 1 } } @try_modules;