- update to VMware-server-e.x.p-84186

Changed files:
    VMware-server-config-kernel.patch -> 1.2
    VMware-server-initscript.patch -> 1.2

diff --git a/VMware-server-config-kernel.patch b/VMware-server-config-kernel.patch
index 353f04b3ebb587aa53c3c5f25a907d7a741ec241..5fa7d2d1e2b7e6a518bca530ee8c6524505fb998 100644 (file)
--- a/VMware-server-config-kernel.patch
+++ b/VMware-server-config-kernel.patch
@@ -1,18 +1,9 @@
---- 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);
+--- vmware-server-distrib/bin/vmware-config.pl~        2008-04-07 21:04:12.095539024 +0300
++++ vmware-server-distrib/bin/vmware-config.pl 2008-04-07 21:08:37.755436186 +0300
+@@ -3932,6 +3932,26 @@
+       && can_build_module($name) eq 'yes') {
+     db_add_answer('BUILDR_' . $name, 'yes');
+   } else {
 +
 +    my $kmod_dir = $cKernelModuleDir . '/'. $gSystem{'uts_release'};
 +    if (-d $kmod_dir) {
@@ -33,6 +24,6 @@
 +      return $found if $found;
 +    }
 +
+     my @mod_list;
+ 
      @mod_list = get_suitable_modules($mod_dir . '/binary');
-     while ($#mod_list > -1) {
-       my $candidate = shift(@mod_list);

diff --git a/VMware-server-initscript.patch b/VMware-server-initscript.patch
index 4741bba31ab59cf0b2d45e675ec56306b411a7db..f98a200106562b3cdfa709f460c15239d04da0a5 100644 (file)
--- a/VMware-server-initscript.patch
+++ b/VMware-server-initscript.patch
@@ -1,11 +1,11 @@
---- vmware-server-distrib/installer/services.sh        2007-11-09 14:22:04.000000000 +0200
-+++ vmware-server-distrib/installer/services.sh        2008-04-07 15:59:41.008239077 +0300
-@@ -681,7 +681,7 @@
+--- vmware-server-distrib/installer/services.sh~       2008-04-07 21:10:24.108183178 +0300
++++ vmware-server-distrib/installer/services.sh        2008-04-07 21:11:52.688130231 +0300
+@@ -755,7 +755,7 @@
  }
  
  vmware_load_module() {
 -   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
 +   /sbin/modprobe $1 || exit 1
-    exit 0
+    return 0
  }