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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-10-19 19:37:51 +0000 (Fri, 19 Oct 2007)
New Revision: 92

Added:
   trunk/debian/patches/05-vboxdrv-references.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
Adding patch from Daniel Hahler <ubuntu at thequod.de> to change the error message for vboxdrv failure, according to virtualbox-ose-modules.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-10-19 19:32:15 UTC (rev 91)
+++ trunk/debian/changelog	2007-10-19 19:37:51 UTC (rev 92)
@@ -6,6 +6,8 @@
   * Replacing virtualbox-modules with virtualbox-ose-modules in
     scripts/VBox.sh.
   * Sorting recommends.
+  * Adding patch from Daniel Hahler <ubuntu at thequod.de> to change the error
+    message for vboxdrv failure, according to virtualbox-ose-modules.
 
  -- Daniel Baumann <daniel at debian.org>  Fri, 19 Oct 2007 18:16:00 +0200
 

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2007-10-19 19:32:15 UTC (rev 91)
+++ trunk/debian/patches/00list	2007-10-19 19:37:51 UTC (rev 92)
@@ -2,3 +2,4 @@
 02-host-module.dpatch
 03-config-kmk.dpatch
 04-localconf-kmk.dpatch
+05-vboxdrv-references.dpatch

Added: trunk/debian/patches/05-vboxdrv-references.dpatch
===================================================================
--- trunk/debian/patches/05-vboxdrv-references.dpatch	                        (rev 0)
+++ trunk/debian/patches/05-vboxdrv-references.dpatch	2007-10-19 19:37:51 UTC (rev 92)
@@ -0,0 +1,34 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 05-vboxdrv-references.dpatch by Daniel Hahler <ubuntu at thequod.de>
+##
+## DP: Change error messages for vboxdrv failure, according to
+## DP: virtualbox-ose-modules.
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.5.2-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1.5.2-dfsg/src/VBox/VMM/VM.cpp
+--- virtualbox-ose-1.5.2-dfsg.orig/src/VBox/VMM/VM.cpp	2007-10-18 11:07:28.000000000 +0000
++++ virtualbox-ose-1.5.2-dfsg/src/VBox/VMM/VM.cpp	2007-10-19 19:33:52.000000000 +0000
+@@ -314,8 +314,8 @@ VMR3DECL(int)   VMR3Create(PFNVMATERROR 
+ #ifdef RT_OS_LINUX
+                 pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
+ 		              "was either not loaded or /dev/vboxdrv is not set up properly. "
+-			      "Re-setup the kernel module by executing "
+-			      "'/etc/init.d/vboxdrv setup' as root");
++                              "Please install the virtualbox-ose-modules package for your "
++                              "kernel and execute '/etc/init.d/vboxdrv start' as root");
+ #else
+                 pszError = N_("VirtualBox kernel driver not loaded.");
+ #endif
+@@ -337,8 +337,9 @@ VMR3DECL(int)   VMR3Create(PFNVMATERROR 
+ #ifdef RT_OS_LINUX
+                 pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
+ 		              "was either not loaded or /dev/vboxdrv was not created for some "
+-			      "reason. Re-setup the kernel module by executing "
+-			      "'/etc/init.d/vboxdrv setup' as root");
++			      "reason. "
++                              "Please install the virtualbox-ose-modules package for your "
++                              "kernel and execute '/etc/init.d/vboxdrv start' as root");
+ #else
+                 pszError = N_("VirtualBox kernel driver not installed");
+ #endif