summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorpad <pad@mandriva.com>1999-09-06 20:33:18 +0000
committerpad <pad@mandriva.com>1999-09-06 20:33:18 +0000
commit115b4b1145f86d90f20c0404a54fa907f06c30b0 (patch)
tree046cd13affb85df1028bcc687e1c8853fc576cd7 /perl-install/modules.pm
parenta6096f902a2df839b7e89c084d629840bf52a3a1 (diff)
downloaddrakx-115b4b1145f86d90f20c0404a54fa907f06c30b0.tar
drakx-115b4b1145f86d90f20c0404a54fa907f06c30b0.tar.gz
drakx-115b4b1145f86d90f20c0404a54fa907f06c30b0.tar.bz2
drakx-115b4b1145f86d90f20c0404a54fa907f06c30b0.tar.xz
drakx-115b4b1145f86d90f20c0404a54fa907f06c30b0.zip
bugfix
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm27
1 files changed, 15 insertions, 12 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 5222e72dc..6124c11b0 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -353,19 +353,22 @@ sub get_stage1_conf {
sub load_thiskind($;&) {
my ($type, $f) = @_;
-
- my @devs = pci_probing::main::probe($type);
- log::l("pci probe found " . scalar @devs . " $type devices");
-
- my %devs; foreach (@devs) {
- my ($text, $mod) = @$_;
- $devs{$mod}++ and log::l("multiple $mod devices found"), next;
- $drivers{$mod} or log::l("module $mod not in install table"), next;
- log::l("found driver for $mod");
- &$f($text, $mod) if $f;
- load($mod, $type);
+ unless ($::testing) {
+ my @devs = pci_probing::main::probe($type);
+ log::l("pci probe found " . scalar @devs . " $type devices");
+
+ my %devs; foreach (@devs) {
+ my ($text, $mod) = @$_;
+ $devs{$mod}++ and log::l("multiple $mod devices found"), next;
+ $drivers{$mod} or log::l("module $mod not in install table"), next;
+ log::l("found driver for $mod");
+ &$f($text, $mod) if $f;
+ load($mod, $type);
+ }
+ @devs;
+ } else {
+ ();
}
- @devs;
}
# This assumes only one of each driver type is loaded