Changeset 23344 in vbox for trunk/src/VBox/Installer/solaris/vboxconfig.sh

Timestamp:

Sep 25, 2009 4:37:29 PM (15 years ago)

Author:

vboxsync

Message:

Solaris/Installer: added new USB bits. (can disable before 3.1 using Config.kmk define if needed)

File:

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

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

@@ -57 +57 @@
 DESC_VBOXUSBMON="USBMonitor"
 
+MOD_VBOXUSB=vboxusb
+DESC_VBOXUSB="USB"
+
 FATALOP=fatal
+NULLOP=nulloutput
 SILENTOP=silent
 IPSOP=ips
@@ -215 +219 @@
 }
 
-# add_driver(modname, moddesc, [driverperm], [fatal])
-# failure: depends on [fatal]
+# add_driver(modname, moddesc, fatal, nulloutput, [driverperm])
+# failure: depends on "fatal"
 add_driver()
 {
@@ -226 +230 @@
     modname="$1"
     moddesc="$2"
-    modperm="$3"
-    if test "$3" = "$FATALOP"; then
-        fatal="$FATALOP"
-        modperm=""
-    fi
-    if test "$4" = "$FATALOP"; then
-        fatal="$FATALOP"
-    fi
+    fatal="$3"
+    nullop="$4"
+    modperm="$5"
 
     if test -n "$modperm"; then
-        $BIN_ADDDRV -m"$modperm" $modname
+        if test "$nullop" = "$NULLOP"; then
+            $BIN_ADDDRV -m"$modperm" $modname  >/dev/null 2>&1
+        else
+            $BIN_ADDDRV -m"$modperm" $modname
+        fi    
     else
-        $BIN_ADDDRV $modname
+        if test "$nullop" = "$NULLOP"; then        
+            $BIN_ADDDRV $modname >/dev/null 2>&1
+        else
+            $BIN_ADDDRV $modname
+        fi        
     fi
 
@@ -342 +349 @@
 {
     if test -n "_HARDENED_"; then
-        add_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "'* 0600 root sys'" "$FATALOP"
+        add_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP" "not-$NULLOP" "'* 0600 root sys'"
     else
-        add_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "'* 0666 root sys'" "$FATALOP"
+        add_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP" "not-$NULLOP" "'* 0666 root sys'"
     fi
     load_module "drv/$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP"
@@ -383 +390 @@
                 exit 1
             fi
+            
+            # Add vboxusb if present
+            # This driver is special, we need it in the boot-archive but since there is no
+            # 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
+                add_driver "$MOD_VBOXUSB" "$DESC_VBOXUSB" "$FATALOP" "$NULLOP"
+            fi
         fi
     else
@@ -411 +426 @@
         mv -f /etc/devlink.vbox /etc/devlink.tab
     fi
+
+    unload_module "$MOD_VBOXUSB" "$DESC_VBOXUSB" "$fatal"
+    rem_driver "$MOD_VBOXUSB" "$DESC_VBOXUSB" "$fatal"
 
     unload_module "$MOD_VBOXUSBMON" "$DESC_VBOXUSBMON" "$fatal"