summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-30 21:50:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-30 21:50:08 +0000
commit7a9b29dbe29f5c09f3bfff1f36fc469f4256acf2 (patch)
treeb39f9f4f784ebea5ad352fd62c6125480c679bf4 /perl-install/modules.pm
parent5b074d5c8cfd6623a15f29c37e565ce41faa55fc (diff)
downloaddrakx-7a9b29dbe29f5c09f3bfff1f36fc469f4256acf2.tar
drakx-7a9b29dbe29f5c09f3bfff1f36fc469f4256acf2.tar.gz
drakx-7a9b29dbe29f5c09f3bfff1f36fc469f4256acf2.tar.bz2
drakx-7a9b29dbe29f5c09f3bfff1f36fc469f4256acf2.tar.xz
drakx-7a9b29dbe29f5c09f3bfff1f36fc469f4256acf2.zip
no_comment
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 1b14a02fb..947108057 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -510,6 +510,7 @@ sub write_conf {
}
my @l = map { "scsi_hostadapter$_\n" } '', 1..$scsi-1 if $scsi;
push @l, "ide-floppy" if detect_devices::ide_zips();
+ log::l("to put in modules @l");
substInFile {
$_ = '' if /^scsi_hostadapter/;
@@ -534,7 +535,7 @@ sub load_thiskind {
grep {
$f->($_->{description}, $_->{driver}) if $f;
- eval { load($_->{driver}) };
+ eval { load($_->{driver}, $type) };
$_->{error} = $@;
!($@ && $_->{try});
@@ -549,7 +550,7 @@ sub get_that_type {
grep {
my $l = $drivers{$_->{driver}};
- $l && $l->{type} eq $type && detect_devices::check($_);
+ $l && $l->{type} =~ /$type/ && detect_devices::check($_);
} detect_devices::probeall('', $pcic);
}