summaryrefslogtreecommitdiff
path: root/libre/virtualbox-libre/vboxdrv-reference.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/virtualbox-libre/vboxdrv-reference.patch')
-rw-r--r--libre/virtualbox-libre/vboxdrv-reference.patch27
1 files changed, 21 insertions, 6 deletions
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index 4e5aa0f0c..9599a3a49 100644
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -21,7 +21,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
- "recompiles the vboxdrv kernel module if necessary."
+ "libre module by executing<br/><br/>"
+ " <font color=blue>'pacman -S virtualbox-libre-modules'</font><br/><br/>"
-+ "as root. If you don't use our stock kernel, install virtualbox-libre-source and "
++ "as root. If you don't use our stock kernel libre, install virtualbox-libre-source and "
+ "execute dkms install vboxhost/4.1.18 ."
);
@@ -41,7 +41,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
- "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 execute<br/><br/> "
++ "VirtualBox. Reload the modules or if you don't use our stock kernel libre execute<br/><br/> "
+ " <font color=blue>'dkms install vboxhost/4.1.18'</font><br/><br/>"
);
@@ -72,13 +72,17 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
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
-@@ -32,17 +32,18 @@
+@@ -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
+-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-modules or
-+ if you don't use our stock kernel compile the modules with
++ if you don't use our stock kernel libre compile the modules with
- sudo /etc/init.d/vboxdrv setup
+ sudo dkms install vboxhost/4.1.18
@@ -95,3 +99,14 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-
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
+ \ No newline at end of file