Changeset 26759 in vbox for trunk

Timestamp:

Feb 24, 2010 6:41:59 PM (15 years ago)

Author:

vboxsync

Message:

Solaris/Installer: vboxconfig.sh reload drivers option and altkerndir options for local builds.

File:

• trunk/src/VBox/Installer/solaris/vboxconfig.sh (modified) (7 diffs)

trunk/src/VBox/Installer/solaris/vboxconfig.sh

@@ -30 +30 @@
 
 DIR_VBOXBASE=/opt/VirtualBox
+DIR_CONF="/platform/i86pc/kernel/drv"
 DIR_MOD_32="/platform/i86pc/kernel/drv"
 DIR_MOD_64=$DIR_MOD_32/amd64
@@ -367 +368 @@
     if test $? -eq 0 && test -h "/dev/vboxdrv"; then
 
-        if test -f /platform/i86pc/kernel/drv/vboxnet.conf; then
+        if test -f "$DIR_CONF/vboxnet.conf"; then
             add_driver "$MOD_VBOXNET" "$DESC_VBOXNET" "$FATALOP"
             load_module "drv/$MOD_VBOXNET" "$DESC_VBOXNET" "$FATALOP"
         fi
 
-        if test -f /platform/i86pc/kernel/drv/vboxflt.conf; then
+        if test -f "$DIR_CONF/vboxflt.conf"; then
             add_driver "$MOD_VBOXFLT" "$DESC_VBOXFLT" "$FATALOP"
             load_module "drv/$MOD_VBOXFLT" "$DESC_VBOXFLT" "$FATALOP"
         fi
 
-        if test -f /platform/i86pc/kernel/drv/vboxusbmon.conf && test "$HOST_OS_MAJORVERSION" != "5.10"; then
+        if test -f "$DIR_CONF/vboxusbmon.conf" && test "$HOST_OS_MAJORVERSION" != "5.10"; then
             # For VirtualBox 3.1 the new USB code requires Nevada > 123
             if test "$HOST_OS_MINORVERSION" -gt 123; then
@@ -399 +400 @@
                 # USB device to attach to now (it's done at runtime) it will fail to attach so
                 # redirect attaching failure output to /dev/null
-                if test -f /platform/i86pc/kernel/drv/vboxusb.conf; then
+                if test -f "$DIR_CONF/vboxusb.conf"; then
                     add_driver "$MOD_VBOXUSB" "$DESC_VBOXUSB" "$FATALOP" "$NULLOP"
                     load_module "drv/$MOD_VBOXUSB" "$DESC_VBOXUSB" "$FATALOP"
@@ -572 +573 @@
 
     if test "$?" -eq 0; then
-        if test -f /platform/i86pc/kernel/drv/vboxnet.conf; then
+        if test -f "$DIR_CONF/vboxnet.conf"; then
             # nwam/dhcpagent fix
             nwamfile=/etc/nwam/llp
@@ -700 +701 @@
 do
     case "$1" in
-        --postinstall | --preremove | --installdrivers | --removedrivers)
+        --postinstall | --preremove | --installdrivers | --removedrivers | --setupdrivers)
             drvop="$1"
             ;;
@@ -711 +712 @@
         --ips)
             ISIPS="$IPSOP"
+            ;;
+        --altkerndir)
+            # Use alternate kernel driver config folder (dev only)
+            DIR_CONF="/usr/kernel/drv"
             ;;
         *)
@@ -734 +739 @@
     remove_drivers "$fatal"
     ;;
+--setupdrivers)
+    remove_drivers "$fatal"
+    install_drivers
+    ;;
 *)
     errorprint "Invalid operation $drvop"