diff options
Diffstat (limited to 'system/virtualbox/vboxdrv.sh-setup.diff')
| -rw-r--r-- | system/virtualbox/vboxdrv.sh-setup.diff | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff index 58f1963e0d..da6633acc3 100644 --- a/system/virtualbox/vboxdrv.sh-setup.diff +++ b/system/virtualbox/vboxdrv.sh-setup.diff @@ -1,5 +1,5 @@ ---- vboxdrv.sh.in.orig 2012-03-13 15:51:56.000000000 +0100 -+++ vboxdrv.sh.in 2012-09-15 13:15:32.215798169 +0200 +--- vboxdrv.sh.in.orig 2012-12-19 19:27:12.000000000 +0100 ++++ vboxdrv.sh.in 2013-01-06 12:33:27.291744988 +0100 @@ -46,17 +46,13 @@ if [ -n "$INSTALL_DIR" ]; then @@ -19,14 +19,17 @@ if [ -n "$NOLSB" ]; then if [ -f /etc/redhat-release ]; then -@@ -297,62 +293,7 @@ +@@ -297,70 +293,7 @@ # setup_script setup() { - stop -- begin_msg "Uninstalling old VirtualBox DKMS kernel modules" -- $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG -- succ_msg +- DKMS=`which dkms 2>/dev/null` +- if [ -n "$DKMS" ]; then +- begin_msg "Uninstalling old VirtualBox DKMS kernel modules" +- $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG +- succ_msg +- fi - if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then - begin_msg "Removing old VirtualBox pci kernel module" - find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null @@ -47,9 +50,14 @@ - find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null - succ_msg - fi -- begin_msg "Trying to register the VirtualBox kernel modules using DKMS" -- if ! $DODKMS install vboxhost $VERSION >> $LOG; then -- fail_msg "Failed, trying without DKMS" +- if [ -n "$DKMS" ]; then +- begin_msg "Trying to register the VirtualBox kernel modules using DKMS" +- if ! $DODKMS install vboxhost $VERSION >> $LOG; then +- fail_msg "Failed, trying without DKMS" +- DKMS="" +- fi +- fi +- if [ -z "$DKMS" ]; then - begin_msg "Recompiling VirtualBox kernel modules" - if ! $BUILDINTMP \ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ |