summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-12-28 11:48:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-12-28 11:48:16 +0000
commit6cbd3ed465fcdfe0ffffb5cc6d86f80af525f0ce (patch)
tree5efda640959dbab7a1bd50016c1fb651157773c6
parent27fe960750eee697d37843ec701734703ad7f99c (diff)
downloaddrakx-backup-do-not-use-6cbd3ed465fcdfe0ffffb5cc6d86f80af525f0ce.tar
drakx-backup-do-not-use-6cbd3ed465fcdfe0ffffb5cc6d86f80af525f0ce.tar.gz
drakx-backup-do-not-use-6cbd3ed465fcdfe0ffffb5cc6d86f80af525f0ce.tar.bz2
drakx-backup-do-not-use-6cbd3ed465fcdfe0ffffb5cc6d86f80af525f0ce.tar.xz
drakx-backup-do-not-use-6cbd3ed465fcdfe0ffffb5cc6d86f80af525f0ce.zip
(load_thiskind): allow $probe_type to be given, allowing forced pci probe (unsafe)
-rw-r--r--perl-install/modules.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 4a72ffdf2..66ddeaef9 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -743,7 +743,7 @@ sub read_stage1_conf {
}
sub load_thiskind {
- my ($type, $f) = @_;
+ my ($type, $f, $probe_type) = @_;
#- get_that_type returns the PCMCIA cards. It doesn't know they are already
#- loaded, so:
@@ -766,12 +766,12 @@ sub load_thiskind {
$_->{error} = $@;
!($@ && $_->{try});
- } get_that_type($type),
+ } get_that_type($type, $probe_type),
map {; { driver => $_, description => $_, try => 1 } } @try_modules;
}
sub get_that_type {
- my ($type) = @_;
+ my ($type, $probe_type) = @_;
grep {
if ($type eq 'isdn') {
@@ -788,7 +788,7 @@ sub get_that_type {
my $l = $drivers{$_->{driver}};
($_->{type} =~ /$type/ || $l && $l->{type} =~ /$type/) && detect_devices::check($_);
}
- } detect_devices::probeall('');
+ } detect_devices::probeall($probe_type);
}
sub load_ide {