SOURCES: VMware-server-config-kernel.patch (NEW) - try modules fro...

[glen]

Author: glen                         Date: Mon Apr  7 13:18:44 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- try modules from kernel dir first for pre-packaged modules

---- Files affected:
SOURCES:
   VMware-server-config-kernel.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/VMware-server-config-kernel.patch
diff -u /dev/null SOURCES/VMware-server-config-kernel.patch:1.1
--- /dev/null	Mon Apr  7 15:18:44 2008
+++ SOURCES/VMware-server-config-kernel.patch	Mon Apr  7 15:18:39 2008
@@ -0,0 +1,38 @@
+--- vmware-server-distrib/bin/vmware-config.pl	2007-11-09 14:22:03.000000000 +0200
++++ vmware-server-distrib/bin/vmware-config.pl	2008-04-07 15:57:41.590945387 +0300
+@@ -3774,7 +3776,7 @@
+     $mod_dir = db_get_answer('LIBDIR') . '/modules';
+   }
+ 
+-  if (($name eq 'vmxnet') and (not is64BitKernel()) and ($gOption{'kernel_version'} eq '')) {
++  if (0 && ($name eq 'vmxnet') and (not is64BitKernel()) and ($gOption{'kernel_version'} eq '')) {
+     # Figure out the correct network script.
+     my $init_dir = db_get_answer('INITSCRIPTSDIR');
+     my $network_path = find_first_exist("$init_dir/network",
+@@ -3820,6 +3822,26 @@
+ 
+     print wrap('Trying to find a suitable ' . $name
+                . ' module for your running kernel.' . "\n\n", 0);
++
++    my $kmod_dir = $cKernelModuleDir . '/'. $gSystem{'uts_release'};
++    if (-d $kmod_dir) {
++      if (not open(MODULESDEP, $kmod_dir .'/modules.dep')) {
++         error("Unable to open kernel module dependency file\n.");
++      }
++
++      my $found;
++      my $match = qr/\Q$name\E\.ko(?:\.gz)?:$/;
++      while (<MODULESDEP>) {
++         if ($match) {
++            $found = 'yes';
++            last;
++         }
++      }
++      close(MODULESDEP);
++
++      return $found if $found;
++    }
++
+     @mod_list = get_suitable_modules($mod_dir . '/binary');
+     while ($#mod_list > -1) {
+       my $candidate = shift(@mod_list);
================================================================