From 6cbd3ed465fcdfe0ffffb5cc6d86f80af525f0ce Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 28 Dec 2001 11:48:16 +0000
Subject: (load_thiskind): allow $probe_type to be given, allowing forced pci
 probe (unsafe)

---
 perl-install/modules.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install/modules.pm')

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 {
-- 
cgit v1.2.1