summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-02-11 23:16:54 +0000
committerOlivier Blin <oblin@mandriva.com>2008-02-11 23:16:54 +0000
commitd488dbbcf96a1ba339b663cfec33d74302d7a0f8 (patch)
treedd8c2b6a69c5a633746bd59ae934e4c80f58f294 /kernel
parentdb73c71d9d6876cbf82136feded054d8c3511cd7 (diff)
downloaddrakx-d488dbbcf96a1ba339b663cfec33d74302d7a0f8.tar
drakx-d488dbbcf96a1ba339b663cfec33d74302d7a0f8.tar.gz
drakx-d488dbbcf96a1ba339b663cfec33d74302d7a0f8.tar.bz2
drakx-d488dbbcf96a1ba339b663cfec33d74302d7a0f8.tar.xz
drakx-d488dbbcf96a1ba339b663cfec33d74302d7a0f8.zip
do not modify modules.dep to load nls modules for fat, but inline in code (to keep a "clean" modules.dep)
Diffstat (limited to 'kernel')
-rw-r--r--kernel/modules.pl5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/modules.pl b/kernel/modules.pl
index 0491e0c09..de6ce1b7b 100644
--- a/kernel/modules.pl
+++ b/kernel/modules.pl
@@ -37,7 +37,8 @@ my ($f, @para) = @ARGV;
$::{$f}->(@para);
sub modules() {
- map { category2modules($_) } split(' ', $images_cat);
+ my @nls_modules = ('nls_cp437', 'nls_iso8859_1');
+ @nls_modules, map { category2modules($_) } split(' ', $images_cat);
}
sub remove_unneeded_modules {
@@ -73,8 +74,6 @@ sub filter_modules_dep {
my ($module, @deps) = map { m!.*/(.*)\.k?o(\.gz)$! && $1 } $f, split(' ', $d);
if (member($module, 'plip', 'ppa', 'imm')) {
@deps = map { $_ eq 'parport' ? 'parport_pc' : $_ } @deps;
- } elsif ($module eq 'vfat') {
- push @deps, 'nls_cp437', 'nls_iso8859-1';
}
join(' ', "$module:", @deps);
} @l;