Changeset 22120 in vbox for trunk/src/VBox/Installer

Timestamp:

Aug 10, 2009 9:27:35 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/Installer: vboxconfig.sh bits.

File:

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

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

@@ -82 +82 @@
 }
 
-success()
-{
-    if test "$ISSILENT" != "$SILENTOP"; then
-        echo 1>&2 "$1"
-    fi
-}
-
 errorprint()
 {
@@ -180 +173 @@
 {
     cputype=`isainfo -k`
-    modulepath="$DIR_MOD_32/$MOD_VBOXDRV"
-    if test "$cputype" = "amd64"; then
-        modulepath="$DIR_MOD_64/$MOD_VBOXDRV"
-    elif test "$cputype" != "i386"; then
-        errorprint "VirtualBox works only on i386/amd64 architectures, not $cputype"
-        exit 1
-    fi
-
-    # If things are where they should be, return success
-    if test -f "$modulepath" || test -h "$modulepath"; then
-        return 0
-    fi
-
-    # Something's screwed, let us go a step further and check if user has mixed up x86/amd64
-    # amd64 ISA, x86 kernel module??
-    if test "$cputype" = "amd64"; then
-        modulepath="$DIR_MOD_32/$MOD_VBOXDRV"
-        if test -f "$modulepath"; then
-            errorprint "Found 32-bit module instead of 64-bit. Please install the amd64 package!"
-            exit 1
-        fi
-    else
-        # x86 ISA, amd64 kernel module??
-        modulepath="$DIR_MOD_64/$MOD_VBOXDRV"
-        if test -f "$modulepath"; then
-            errorprint "Found 64-bit module instead of 32-bit. Please install the x86 package!"
-            exit 1
-        fi
-    fi
-
-    # Shouldn't really happen...
-    errorprint "VirtualBox Host kernel module NOT installed."
-    exit 1
+    if test "$cputype" != "amd64" || test "$cputype" != "i386"; then
+        errorprint "VirtualBox works only on i386/amd64 hosts, not $cputype"
+        exit 1
+    fi
 }