Changeset 15131 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Dec 8, 2008 8:34:10 PM (16 years ago)

Author:

vboxsync

Message:

#3202: VBoxDrv[Tiger] fixes. Created two VBoxUSB versions too and kicked out the horrible postflight hack that edited Info.plist. Made VBoxUSB depend on VBoxDrv and share IPRT with it.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/loadnetflt.sh (modified) (6 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/loadnetflt.sh

@@ -11 +11 @@
 #
 
+SCRIPT_NAME="loadusb"
 XNU_VERSION=`LC_ALL=C uname -r | LC_ALL=C cut -d . -f 1`
 
@@ -17 +18 @@
 
 if [ "$XNU_VERSION" -ge "9" ]; then
-  DEP_DRVNAME="VBoxDrv.kext"
+    DEP_DRVNAME="VBoxDrv.kext"
 else
-  DEP_DRVNAME="VBoxDrvTiger.kext"
+    DEP_DRVNAME="VBoxDrvTiger.kext"
 fi
 DEP_BUNDLE="org.virtualbox.kext.VBoxDrv"
@@ -47 +48 @@
 LOADED=`kextstat -b $BUNDLE -l`
 if test -n "$LOADED"; then
-    echo "loadnetflt.sh: Unloading $BUNDLE..."
+    echo "${SCRIPT_NAME}.sh: Unloading $BUNDLE..."
     sudo kextunload -v 6 -b $BUNDLE
     LOADED=`kextstat -b $BUNDLE -l`
     if test -n "$LOADED"; then
-        echo "loadnetflt: failed to unload $BUNDLE, see above..."
+        echo "${SCRIPT_NAME}.sh: failed to unload $BUNDLE, see above..."
         exit 1;
     fi
-    echo "loadnetflt: Successfully unloaded $BUNDLE"
+    echo "${SCRIPT_NAME}.sh: Successfully unloaded $BUNDLE"
 fi
 
@@ -61 +62 @@
 # Copy the .kext to the symbols directory and tweak the kextload options.
 if test -n "$VBOX_DARWIN_SYMS"; then
-    echo "loadnetflt.sh: copying the extension the symbol area..."
+    echo "${SCRIPT_NAME}.sh: copying the extension the symbol area..."
     rm -Rf "$VBOX_DARWIN_SYMS/$DRVNAME"
     mkdir -p "$VBOX_DARWIN_SYMS"
@@ -74 +75 @@
 OWNER=`/usr/bin/stat -f "%u" "$DIR"`
 if test "$OWNER" -ne 0; then
-    TMP_DIR=/tmp/loadusb.tmp
-    echo "loadnetflt.sh: chown didn't work on $DIR, using temp location $TMP_DIR/$DRVNAME"
+    TMP_DIR=/tmp/${SCRIPT_NAME}.tmp
+    echo "${SCRIPT_NAME}.sh: chown didn't work on $DIR, using temp location $TMP_DIR/$DRVNAME"
 
     # clean up first (no sudo rm)
@@ -97 +98 @@
 sudo chmod -R o-rwx "$DIR"
 sync
-echo "loadnetflt: loading $DIR... (kextload $OPTS \"$DIR\")"
+echo "${SCRIPT_NAME}.sh: loading $DIR... (kextload $OPTS \"$DIR\")"
 sudo kextload $OPTS -d "$DEP_DIR" "$DIR"
 sync