[Pkg-virtualbox-commits] r304 - in trunk/debian: . patches

[daniel at alioth.debian.org]

Author: daniel
Date: 2008-06-23 16:30:41 +0000 (Mon, 23 Jun 2008)
New Revision: 304

Added:
   trunk/debian/patches/13-module-mismatch.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
Adding patch to adjust failure message with Debian specific solution when experiencing kernel module version mismatch.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-17 12:53:58 UTC (rev 303)
+++ trunk/debian/changelog	2008-06-23 16:30:41 UTC (rev 304)
@@ -5,6 +5,8 @@
     01-no-64bit-guest.dpatch in order to be more accurate for ia32 subarchs
     like lpia, thanks to Loic Minier <lool at debian.org>.
   * Rediffing 02-config-kmk.dpatch.
+  * Adding patch to adjust failure message with Debian specific solution when
+    experiencing kernel module version mismatch.
 
   [ Hilko Bengen ]
   * Re-added watch file: sources can once again be downloaded directly

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-06-17 12:53:58 UTC (rev 303)
+++ trunk/debian/patches/00list	2008-06-23 16:30:41 UTC (rev 304)
@@ -10,3 +10,4 @@
 10-workaround-gcc-ice.dpatch
 11-gcc-4.3.dpatch
 12-make-module.dpatch
+13-module-mismatch.dpatch

Added: trunk/debian/patches/13-module-mismatch.dpatch
===================================================================
--- trunk/debian/patches/13-module-mismatch.dpatch	                        (rev 0)
+++ trunk/debian/patches/13-module-mismatch.dpatch	2008-06-23 16:30:41 UTC (rev 304)
@@ -0,0 +1,25 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 13-module-mismatch.dpatch by Daniel Baumann <daniel at debian.org>
+##
+## DP: Adjusts failure message with Debian specific solution.
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.6.2-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1.6.2-dfsg/src/VBox/VMM/VM.cpp
+--- virtualbox-ose-1.6.2-dfsg.orig/src/VBox/VMM/VM.cpp	2008-05-14 15:09:39.000000000 +0000
++++ virtualbox-ose-1.6.2-dfsg/src/VBox/VMM/VM.cpp	2008-06-23 16:10:30.000000000 +0000
+@@ -293,9 +293,11 @@ VMR3DECL(int)   VMR3Create(PFNVMATERROR 
+                     break;
+                 case VERR_VERSION_MISMATCH:
+                 case VERR_VM_DRIVER_VERSION_MISMATCH:
+-                    pszError = N_("The VirtualBox support driver which is running is from a different "
+-                                  "version of VirtualBox.  You can correct this by stopping all "
+-                                  "running instances of VirtualBox and reinstalling the software.");
++                    pszError = N_("The version of the VirtualBox kernel modules and the version of "
++				  "VirtualBox application are not matching. You can correct this by "
++				  "either installing the correct virtualbox-ose-modules package "
++				  "(if available) through apt-get or by building it manually with: "
++				  "module-assistant auto-install virtualbox-ose");
+                     break;
+                 default:
+                     pszError = N_("Unknown error initializing kernel driver");