- try to handle the built-in module case before trying to load a module.

1 files changed, 24 insertions, 1 deletions

diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index f81b1af4b..5b5f7de5f 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -61,7 +61,30 @@ sub module_is_available {
 #-###############################################################################
 # handles dependencies
 sub load_raw {
-    my ($l, $h_options) = @_;
+    my ($lm, $h_options) = @_;
+
+    #  try to detect built-in modules by looking at /sys/module
+    #  unfortunately it does not work for all modules eg :
+    #  - networks protocols  like af_packet
+    #  - file systems
+    foreach my $mod (@$lm) {
+	$mod =~ s/-/_/g;
+        if (-d "/sys/module/$mod") {
+	  log::l("$mod already loaded");
+    	} elsif ($mod =~ /af_packet/) {
+	  if (-f "/proc/net/packet") {
+	    log::l("$mod already loaded");
+	  } else {
+	    @$l = (@$l, $mod);
+	  }
+	} elsif (cat_("/proc/filesystems") =~ /$mod/) {
+	  log::l("$mod already loaded");
+	} elsif ($mod =~ /serial/) {
+	  # hack ... must find who tries to load the module serial
+	} else {
+	  @$l = (@$l, $mod);
+	}
+    }
     if ($::testing || $::local_install) {
 	log::l("i would load module $_ ($h_options->{$_})") foreach @$l;
     } elsif ($::isInstall) {