Changeset 19030 in vbox for trunk/src/VBox/Installer/linux/vboxdrv.sh.in

Timestamp:

Apr 20, 2009 2:18:53 PM (16 years ago)

Author:

vboxsync

Message:

#2954: Updated Linux installers for vboxnetadp.ko

File:

• trunk/src/VBox/Installer/linux/vboxdrv.sh.in (modified) (7 diffs)

trunk/src/VBox/Installer/linux/vboxdrv.sh.in

@@ -40 +40 @@
     BUILDVBOXDRV="$INSTALL_DIR/src/vboxdrv/build_in_tmp"
     BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxnetflt/build_in_tmp"
+    BUILDVBOXNETADP="$INSTALL_DIR/src/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"
 fi
 
@@ -182 +184 @@
     # ensure permissions
     if ! chown :$GROUPNAME $DEVICE 2>/dev/null; then
+        rmmod vboxnetadp 2>/dev/null
         rmmod vboxnetflt 2>/dev/null
         rmmod vboxdrv 2>/dev/null
@@ -189 +192 @@
         failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
     fi
+    if ! modprobe vboxnetadp > /dev/null 2>&1; then
+        failure "modprobe vboxnetadp failed. Please use 'dmesg' to find out why"
+    fi
     succ_msg
 }
@@ -195 +201 @@
 {
     begin_msg "Stopping VirtualBox kernel module"
+    if running vboxnetadp; then
+        if ! rmmod vboxnetadp 2>/dev/null; then
+            failure "Cannot unload module vboxnetadp"
+        fi
+    fi
     if running vboxdrv; then
         if running vboxnetflt; then
@@ -261 +272 @@
 {
     stop
+    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
+        succ_msg
+    fi  
     if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then
         begin_msg "Removing old VirtualBox netflt kernel module"
@@ -282 +298 @@
         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"
+    fi
     rm -f /etc/vbox/module_not_compiled
     succ_msg
@@ -291 +312 @@
     if running vboxdrv; then
         if running vboxnetflt; then
-            echo "VirtualBox kernel modules (vboxdrv and vboxnetflt) are loaded."
+            if running vboxnetadp; then
+                echo "VirtualBox kernel modules (vboxdrv, vboxnetflt and vboxnetadp) are loaded."
+            else
+                echo "VirtualBox kernel modules (vboxdrv and vboxnetflt) are loaded."
+            fi
         else
             echo "VirtualBox kernel module is loaded."