summaryrefslogtreecommitdiff
path: root/libre/virtualbox-libre/001-vboxdrv-reference.patch
blob: 51fd6361cb6f8d697e4e30447925c42e6c7a7520 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:22:13.636083176 +0000
+++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:48:58.915541368 +0000
@@ -67,38 +67,34 @@
 
 /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */
 QString g_QStrHintLinuxNoMemory = QApplication::tr(
-  "This error means that the kernel driver was either not able to "
+  "This error means that the kernel libre driver was either not able to "
   "allocate enough memory or that some mapping operation failed."
   );
 
 QString g_QStrHintLinuxNoDriver = QApplication::tr(
-  "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
+  "The VirtualBox Linux-libre 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. If it is available in your distribution, you should install the "
-  "DKMS package first. This package keeps track of Linux kernel changes and "
-  "recompiles the vboxdrv kernel module if necessary."
+  "libre module by executing<br/><br/>"
+  "  <font color=blue>'pacman -S virtualbox-libre-host-modules'</font><br/><br/>"
+  "as root. If you don't use our stock kernel libre, install virtualbox-libre-host-source and "
+  "execute dkms autoinstall ."
   );
 
 QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
-  "The VirtualBox kernel modules do not match this version of "
+  "The VirtualBox kernel libre modules do not match this version of "
   "VirtualBox. The installation of VirtualBox was apparently not "
   "successful. Please try completely uninstalling and reinstalling "
   "VirtualBox."
   );
 
 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."
+  "The VirtualBox kernel libre modules do not match this version of "
+  "VirtualBox. Reload the modules or if you don't use our stock kernel libre execute<br/><br/> "
+  "  <font color=blue>'dkms autoinstall'</font><br/><br/>"
   );
 
 QString g_QStrHintOtherNoDriver = QApplication::tr(
-  "Make sure the kernel module has been loaded successfully."
+  "Make sure the kernel libre module has been loaded successfully."
   );
 
 /* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
@@ -590,7 +586,7 @@
             case VERR_VM_DRIVER_NOT_INSTALLED:
             case VERR_VM_DRIVER_LOAD_ERROR:
                 msgText += QApplication::tr (
-                        "<b>Cannot access the kernel driver!</b><br/><br/>");
+                        "<b>Cannot access the kernel libre driver!</b><br/><br/>");
 # ifdef RT_OS_LINUX
                 msgText += g_QStrHintLinuxNoDriver;
 # else
@@ -603,7 +599,7 @@
                 break;
 # endif
             case VERR_VM_DRIVER_NOT_ACCESSIBLE:
-                msgText += QApplication::tr ("Kernel driver not accessible");
+                msgText += QApplication::tr ("Kernel libre driver not accessible");
                 break;
             case VERR_VM_DRIVER_VERSION_MISMATCH:
 # ifdef RT_OS_LINUX
diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:22:13.549415814 +0000
+++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:56:50.735874087 +0000
@@ -30,19 +30,20 @@
     SHUTDOWN="true"
 elif ! lsmod|grep -q vboxdrv; then
     cat << EOF
-WARNING: The vboxdrv kernel module is not loaded. Either there is no module
-         available for the current kernel (`uname -r`) or it failed to
-         load. Please recompile the kernel module and install it by
+WARNING: The vboxdrv kernel libre module is not loaded. Either there is no module
+         available for the current kernel libre (`uname -r`) or it failed to
+         load. Please reinstall the kernel libre module virtualbox-libre-host-modules or
+         if you don't use our stock kernel libre compile the modules with
 
-           sudo /etc/init.d/vboxdrv setup
+           sudo dkms autoinstall
 
          You will not be able to start VMs until this problem is fixed.
 EOF
 elif [ ! -c /dev/vboxdrv ]; then
     cat << EOF
-WARNING: The character device /dev/vboxdrv does not exist. Try
+WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
 
-           sudo /etc/init.d/vboxdrv restart
+           sudo modprobe vboxdrv
 
          and if that is not successful, try to re-install the package.
 
@@ -52,9 +53,8 @@
 
 if [ -f /etc/vbox/module_not_compiled ]; then
     cat << EOF
-WARNING: The compilation of the vboxdrv.ko kernel module failed during the
+WARNING: The compilation of the vboxdrv.ko kernel libre module failed during the
          installation for some reason. Starting a VM will not be possible.
-         Please consult the User Manual for build instructions.
 EOF
 fi