summaryrefslogtreecommitdiffstats
path: root/kernel/modules.pl
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-09-28 15:32:45 +0000
committerOlivier Blin <oblin@mandriva.org>2005-09-28 15:32:45 +0000
commit59b875917b51422091d5b7bded36901af9e979d4 (patch)
tree2aced25adf2fab5f388469c402c0ac2a019ea566 /kernel/modules.pl
parentc8c279e9bace7e954a3aa3412edd833187229564 (diff)
downloaddrakx-59b875917b51422091d5b7bded36901af9e979d4.tar
drakx-59b875917b51422091d5b7bded36901af9e979d4.tar.gz
drakx-59b875917b51422091d5b7bded36901af9e979d4.tar.bz2
drakx-59b875917b51422091d5b7bded36901af9e979d4.tar.xz
drakx-59b875917b51422091d5b7bded36901af9e979d4.zip
reject unavailable modules in stage1 list (#18803)
Diffstat (limited to 'kernel/modules.pl')
-rw-r--r--kernel/modules.pl7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/modules.pl b/kernel/modules.pl
index 68e6c4ab9..a6ad02fb3 100644
--- a/kernel/modules.pl
+++ b/kernel/modules.pl
@@ -213,8 +213,13 @@ sub get_main_modules() {
sub pci_modules4stage1 {
my ($category) = @_;
+ my @list = map { s/\.k?o.*$//; chomp_($_) } get_main_modules();
+ my %listed;
+ @listed{@list} = ();
my @modules = difference2([ category2modules($category) ], \@modules_removed_from_stage1);
- print "$_\n" foreach uniq(map { dependencies_closure($_) } @modules);
+ my ($kept, $rejected) = partition { exists $listed{$_} } @modules;
+ print STDERR "REJECTED @$rejected\n" if $verbose;
+ print "$_\n" foreach uniq(map { dependencies_closure($_) } @$kept);
}
sub check() {