summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-10-08 11:42:45 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-10-08 11:42:45 +0000
commit0f48e147d39575f98db29f7e21d5347e6e309d04 (patch)
treefba03e3d6c57d3b202f973fc11907372dd26f64e /perl-install/modules.pm
parentc5a4cbe6c55d38bcc411bd94f088f36b85681899 (diff)
downloaddrakx-0f48e147d39575f98db29f7e21d5347e6e309d04.tar
drakx-0f48e147d39575f98db29f7e21d5347e6e309d04.tar.gz
drakx-0f48e147d39575f98db29f7e21d5347e6e309d04.tar.bz2
drakx-0f48e147d39575f98db29f7e21d5347e6e309d04.tar.xz
drakx-0f48e147d39575f98db29f7e21d5347e6e309d04.zip
no_comment
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 60ca503b2..40b7d523b 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -2,6 +2,7 @@ package modules;
use diagnostics;
use strict;
+use vars qw(%loaded);
use common qw(:common :file);
use pci_probing::main;
@@ -11,6 +12,7 @@ use log;
my %conf;
+my %loaded; #- array of loaded modules for each types (scsi/net/...)
my $scsi = 0;
my %deps = ();
@@ -168,6 +170,7 @@ sub load($;$@) {
load($_, 'prereq') foreach @{$deps{$name}};
load_raw($name, @options);
}
+ push @{$loaded{$type}}, $name;
$conf{'scsi_hostadapter' . ($scsi++ || '')}{alias} = $name
if $type && $type eq 'scsi';
@@ -287,7 +290,7 @@ sub load_thiskind($;&$) {
&$f($text, $mod) if $f;
load($mod, $type);
}
- @devs;
+ @devs, map { [ $_, $_ ] } @{$loaded{$type} || []};
}
sub pcmcia_need_config($) {
@@ -333,5 +336,3 @@ sub get_pcmcia_devices($$) {
#- removeModule($m[0]);
#- 1;
#-}
-
-