Changeset 26852 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Feb 26, 2010 1:52:34 PM (15 years ago)

Author:

vboxsync

Message:

Solaris/Installer: fixed regression caused by r58016

File:

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

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

@@ -351 +351 @@
 install_drivers()
 {
-    if test -n "_HARDENED_"; then
-        add_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP" "not-$NULLOP" "'* 0600 root sys'"
+    if test -f "$DIR_CONF/vboxdrv.conf"; then
+        if test -n "_HARDENED_"; then
+            add_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP" "not-$NULLOP" "'* 0600 root sys'"
+        else
+            add_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP" "not-$NULLOP" "'* 0666 root sys'"
+        fi
+        load_module "drv/$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP"
     else
-        add_driver "$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP" "not-$NULLOP" "'* 0666 root sys'"
-    fi
-    load_module "drv/$MOD_VBOXDRV" "$DESC_VBOXDRV" "$FATALOP"
+        errorprint "Extreme error! Missing $DIR_CONF/vboxdrv.conf, aborting."
+        return 1
+    fi
 
     # Add vboxdrv to devlink.tab
@@ -718 +723 @@
             ;;
         *)
-            errorprint "Invalid operation: $1"
-            exit 1
+            break
             ;;
     esac