Removed yet another mentioning of upstream's init script.

Closes: #560320

1 files changed, 53 insertions, 25 deletions

diff --git a/debian/patches/04-vboxdrv-references.dpatch b/debian/patches/04-vboxdrv-references.dpatch
index 401398e73..51e39b8a4 100755
--- a/debian/patches/04-vboxdrv-references.dpatch
+++ b/debian/patches/04-vboxdrv-references.dpatch
@@ -5,29 +5,23 @@
 ## DP: virtualbox-ose-source (DKMS).
 
 @DPATCH@
-diff -urNad virtualbox-ose-3.1.0-dfsg~/src/VBox/Frontends/VirtualBox/src/main.cpp virtualbox-ose-3.1.0-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp
---- virtualbox-ose-3.1.0-dfsg~/src/VBox/Frontends/VirtualBox/src/main.cpp	2009-10-07 11:27:13.000000000 +0200
-+++ virtualbox-ose-3.1.0-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp	2009-10-07 13:42:18.215472116 +0200
-@@ -71,13 +71,8 @@
-   );
- 
- QString g_QStrHintLinuxNoDriver = QApplication::tr(
--  "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
--  "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
--  "module by executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
--  "package first. This package keeps track of Linux kernel changes and "
--  "recompiles the vboxdrv kernel module if necessary."
-+  "Please install the virtualbox-ose-dkms package for your "
-+  "kernel and execute 'modprobe vboxdrv' as root."
-   );
- 
- QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
 diff -urNad virtualbox-ose-3.1.0-dfsg~/src/VBox/VMM/VM.cpp virtualbox-ose-3.1.0-dfsg/src/VBox/VMM/VM.cpp
 --- virtualbox-ose-3.1.0-dfsg~/src/VBox/VMM/VM.cpp	2009-10-07 11:27:14.000000000 +0200
 +++ virtualbox-ose-3.1.0-dfsg/src/VBox/VMM/VM.cpp	2009-10-07 13:42:18.215472116 +0200
-@@ -332,10 +332,8 @@
+@@ -289,10 +289,8 @@
+ 
+ #ifdef RT_OS_LINUX
+                 case VERR_SUPDRV_COMPONENT_NOT_FOUND:
+-                    pszError = N_("One of the kernel modules was not successfully loaded. Make sure "
+-                                  "that no kernel modules from an older version of VirtualBox exist. "
+-                                  "Then try to recompile and reload the kernel modules by executing "
+-                                  "'/etc/init.d/vboxdrv setup' as root");
++		    pszError = N_("Please install the virtualbox-ose-dkms package "
++				  "and execute 'modprobe vboxdrv' as root");
+                     break;
+ #endif
+ 
+@@ -334,10 +332,8 @@
              {
                  case VERR_VM_DRIVER_LOAD_ERROR:
  #ifdef RT_OS_LINUX
@@ -35,12 +29,12 @@ diff -urNad virtualbox-ose-3.1.0-dfsg~/src/VBox/VMM/VM.cpp virtualbox-ose-3.1.0-
 -                                  "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");
-+                    pszError = N_("Please install the virtualbox-ose-dkms package for your "
-+		    		  "kernel and execute 'modprobe vboxdrv' as root");
++                    pszError = N_("Please install the virtualbox-ose-dkms package "
++		    		  "and execute 'modprobe vboxdrv' as root");
  #else
                      pszError = N_("VirtualBox kernel driver not loaded");
  #endif
-@@ -374,10 +372,8 @@
+@@ -376,10 +372,8 @@
                  case VERR_INVALID_HANDLE: /** @todo track down and fix this error. */
                  case VERR_VM_DRIVER_NOT_INSTALLED:
  #ifdef RT_OS_LINUX
@@ -48,8 +42,42 @@ diff -urNad virtualbox-ose-3.1.0-dfsg~/src/VBox/VMM/VM.cpp virtualbox-ose-3.1.0-
 -                                  "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");
-+                    pszError = N_("Please install the virtualbox-ose-dkms package for your "
-+		    		  "kernel and execute 'modprobe vboxdrv' as root");
++                    pszError = N_("Please install the virtualbox-ose-dkms package "
++		    		  "and execute 'modprobe vboxdrv' as root");
  #else
                      pszError = N_("VirtualBox kernel driver not installed");
  #endif
+diff -urNad virtualbox-ose-3.1.0-dfsg~/src/VBox/Frontends/VirtualBox/src/main.cpp virtualbox-ose-3.1.0-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp
+--- virtualbox-ose-3.1.0-dfsg~/src/VBox/Frontends/VirtualBox/src/main.cpp	2009-10-07 11:27:13.000000000 +0200
++++ virtualbox-ose-3.1.0-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp	2009-10-07 13:42:18.215472116 +0200
+@@ -72,13 +72,8 @@
+   );
+ 
+ QString g_QStrHintLinuxNoDriver = QApplication::tr(
+-  "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
+-  "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
+-  "module by executing<br/><br/>"
+-  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
+-  "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
+-  "package first. This package keeps track of Linux kernel changes and "
+-  "recompiles the vboxdrv kernel module if necessary."
++  "Please install the virtualbox-ose-dkms package "
++  "and execute 'modprobe vboxdrv' as root."
+   );
+ 
+ QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
+@@ -89,12 +84,8 @@
+   );
+ 
+ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
+-  "The VirtualBox kernel modules do not match this version of "
+-  "VirtualBox. The installation of VirtualBox was apparently not "
+-  "successful. Executing<br/><br/>"
+-  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
+-  "may correct this. Make sure that you do not mix the "
+-  "OSE version and the PUEL version of VirtualBox."
++  "Please install the virtualbox-ose-dkms package "
++  "and execute 'modprobe vboxdrv' as root."
+   );
+ 
+ QString g_QStrHintOtherNoDriver = QApplication::tr(