diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-09-18 21:41:07 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-09-18 21:41:07 +0000 |
| commit | 0976d0441bee25d06260dad7b520173063e194ec (patch) | |
| tree | 133061d9d342351265be9744522f91d5b5648e70 /perl-install/modules.pm | |
| parent | a3f0d48ce9bec90c2304166b1185ddb457a9775a (diff) | |
| download | drakx-0976d0441bee25d06260dad7b520173063e194ec.tar drakx-0976d0441bee25d06260dad7b520173063e194ec.tar.gz drakx-0976d0441bee25d06260dad7b520173063e194ec.tar.bz2 drakx-0976d0441bee25d06260dad7b520173063e194ec.tar.xz drakx-0976d0441bee25d06260dad7b520173063e194ec.zip | |
no_comment
Diffstat (limited to 'perl-install/modules.pm')
| -rw-r--r-- | perl-install/modules.pm | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 22584aa1b..076feab51 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -295,22 +295,19 @@ sub get_stage1_conf { sub load_thiskind($;&) { my ($type, $f) = @_; - unless ($::testing) { - my @devs = pci_probing::main::probe($type); - log::l("pci probe found " . scalar @devs . " $type devices"); + + 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 { - (); + 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; } #-#- This assumes only one of each driver type is loaded |