diff options
Diffstat (limited to 'system/virtualbox-ose/vboxdrv.sh-setup.diff')
| -rw-r--r-- | system/virtualbox-ose/vboxdrv.sh-setup.diff | 61 |
1 files changed, 35 insertions, 26 deletions
diff --git a/system/virtualbox-ose/vboxdrv.sh-setup.diff b/system/virtualbox-ose/vboxdrv.sh-setup.diff index 99e3275a8e7fb..56f0e61b35ec5 100644 --- a/system/virtualbox-ose/vboxdrv.sh-setup.diff +++ b/system/virtualbox-ose/vboxdrv.sh-setup.diff @@ -1,25 +1,30 @@ ---- vboxdrv.sh.in.orig 2009-08-04 19:18:41.000000000 +0200 -+++ vboxdrv.sh.in 2009-08-05 15:07:09.311051154 +0200 -@@ -37,14 +37,8 @@ +--- mnt/progs/slack/test/VirtualBox-3.2.10_OSE/src/VBox/Installer/linux/vboxdrv.sh.in 2010-10-08 22:10:25.000000000 +0200 ++++ tmp/vboxdrv.sh.in 2010-10-14 17:43:18.545000084 +0200 +@@ -43,16 +43,8 @@ if [ -n "$INSTALL_DIR" ]; then VBOXMANAGE="$INSTALL_DIR/VBoxManage" -- BUILDVBOXDRV="$INSTALL_DIR/src/vboxdrv/build_in_tmp" -- BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxnetflt/build_in_tmp" -- BUILDVBOXNETADP="$INSTALL_DIR/src/vboxnetadp/build_in_tmp" +- DODKMS="$INSTALL_DIR/src/vboxhost/do_dkms" +- BUILDVBOXDRV="$INSTALL_DIR/src/vboxhost/vboxdrv/build_in_tmp" +- BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxhost/vboxnetflt/build_in_tmp" +- BUILDVBOXNETADP="$INSTALL_DIR/src/vboxhost/vboxnetadp/build_in_tmp" else VBOXMANAGE="/usr/lib/%PACKAGE%/VBoxManage" -- BUILDVBOXDRV="/usr/share/%PACKAGE%/src/vboxdrv/build_in_tmp" -- BUILDVBOXNETFLT="/usr/share/%PACKAGE%/src/vboxnetflt/build_in_tmp" -- BUILDVBOXNETADP="/usr/share/%PACKAGE%/src/vboxnetadp/build_in_tmp" +- DODKMS="/usr/share/%PACKAGE%/src/vboxhost/do_dkms" +- BUILDVBOXDRV="/usr/share/%PACKAGE%/src/vboxhost/vboxdrv/build_in_tmp" +- BUILDVBOXNETFLT="/usr/share/%PACKAGE%/src/vboxhost/vboxnetflt/build_in_tmp" +- BUILDVBOXNETADP="/usr/share/%PACKAGE%/src/vboxhost/vboxnetadp/build_in_tmp" fi - if [ -n "$NOLSB" ]; then -@@ -271,41 +265,7 @@ - + # silently exit if the package was uninstalled but not purged, +@@ -284,48 +276,7 @@ + # setup_script setup() { - stop +- begin_msg "Uninstalling old VirtualBox DKMS kernel modules" +- $DODKMS uninstall > $LOG +- succ_msg - if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then - begin_msg "Removing old VirtualBox netadp kernel module" - find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null @@ -35,21 +40,25 @@ - find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null - succ_msg - fi -- begin_msg "Recompiling VirtualBox kernel module" -- if ! $BUILDVBOXDRV \ -- --save-module-symvers /tmp/vboxdrv-Module.symvers \ -- --no-print-directory install > $LOG 2>&1; then -- failure "Look at $LOG to find out what went wrong" -- fi -- if ! $BUILDVBOXNETFLT \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --no-print-directory install >> $LOG 2>&1; then -- failure "Look at $LOG to find out what went wrong" -- fi -- if ! $BUILDVBOXNETADP \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- begin_msg "Trying to register the VirtualBox kernel modules using DKMS" +- if ! $DODKMS install >> $LOG; then +- fail_msg "Failed, trying without DKMS" +- begin_msg "Recompiling VirtualBox kernel modules" +- if ! $BUILDVBOXDRV \ +- --save-module-symvers /tmp/vboxdrv-Module.symvers \ +- --no-print-directory install >> $LOG 2>&1; then +- failure "Look at $LOG to find out what went wrong" +- fi +- if ! $BUILDVBOXNETFLT \ +- --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --no-print-directory install >> $LOG 2>&1; then +- failure "Look at $LOG to find out what went wrong" +- fi +- if ! $BUILDVBOXNETADP \ +- --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then -- failure "Look at $LOG to find out what went wrong" +- failure "Look at $LOG to find out what went wrong" +- fi - fi - rm -f /etc/vbox/module_not_compiled - succ_msg |