From d488dbbcf96a1ba339b663cfec33d74302d7a0f8 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Mon, 11 Feb 2008 23:16:54 +0000
Subject: do not modify modules.dep to load nls modules for fat, but inline in
 code (to keep a "clean" modules.dep)

---
 kernel/modules.pl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'kernel')

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;
-- 
cgit v1.2.1