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

Timestamp:

Aug 10, 2009 9:55:47 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/Installer: vboxconfig.sh fix.

Location:

trunk/src/VBox/Installer/solaris

Files:

• postinstall.sh (modified) (1 diff)
• vboxconfig.sh (modified) (9 diffs)

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

@@ -25 +25 @@
 if test "$currentisa" = "i86xpv"; then
     echo "## VirtualBox cannot run under xVM Dom0! Fatal Error, Aborting installation!"
-    exit 2
+    exit 1
 fi
 
-osversion=`uname -r`
 currentzone=`zonename`
 if test "$currentzone" = "global"; then

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

@@ -173 +173 @@
 {
     cputype=`isainfo -k`
-    if test "$cputype" != "amd64" || test "$cputype" != "i386"; then
+    if test "$cputype" != "amd64" && test "$cputype" != "i386"; then
         errorprint "VirtualBox works only on i386/amd64 hosts, not $cputype"
         exit 1
@@ -293 +293 @@
         $BIN_MODUNLOAD -i $modid
         if test $? -eq 0; then
-            subprint "Unloaded:  $moddesc module"
+            subprint "Unloaded: $moddesc module"
         else
-            subprint "Unloading:  $moddesc  ...FAILED!"
+            subprint "Unloading: $moddesc  ...FAILED!"
             if test "$fatal" = "$FATALOP"; then
                 exit 1
@@ -320 +320 @@
     $BIN_MODLOAD -p $modname
     if test $? -eq 0; then
-        subprint "Loaded:  $moddesc module"
+        subprint "Loaded: $moddesc module"
         return 0
     else
-        subprint "Loading:  $modesc  ...FAILED!"
+        subprint "Loading: $modesc  ...FAILED!"
         if test "$fatal" = "$FATALOP"; then
             exit 1
@@ -444 +444 @@
 install_python_bindings()
 {
-    PYTHONBIN=$1
-    if test -x "$PYTHONBIN"; then
+    if test -z "$1" || test -z "$2"; then
+        errorprint "missing argument to install_python_bindings"
+        exit 1
+    fi
+
+    pythonbin=$1
+    pythondesc=$2
+    if test -x "$pythonbin"; then
         VBOX_INSTALL_PATH="$DIR_VBOXBASE"
         export VBOX_INSTALL_PATH
         cd $DIR_VBOXBASE/sdk/installer
-        $PYTHONBIN ./vboxapisetup.py install > /dev/null
+        $pythonbin ./vboxapisetup.py install > /dev/null
+        if test "$?" -eq 0; then
+            subprint "Installed: Bindings for $pythondesc"
+        fi
         return 0
     fi
@@ -468 +477 @@
         $BIN_SVCCFG delete svc:/application/virtualbox/webservice:default
         if test "$?" -eq 0; then
-            subprint "Unloaded:  Web service"
+            subprint "Unloaded: Web service"
         else
-            subprint "Unloading:  Web service  ...ERROR(S)."
+            subprint "Unloading: Web service  ...ERROR(S)."
         fi
     fi
@@ -480 +489 @@
         $BIN_SVCCFG delete svc:/application/virtualbox/zoneaccess
         if test "$?" -eq 0; then
-            subprint "Unloaded:  Zone access service"
+            subprint "Unloaded: Zone access service"
         else
-            subprint "Unloading:  Zone access service  ...ERROR(S)."
+            subprint "Unloading: Zone access service  ...ERROR(S)."
         fi
     fi
@@ -537 +546 @@
             /usr/sbin/svcadm disable -s svc:/application/virtualbox/webservice:default
             if test "$?" -eq 0; then
-                subprint "Loaded:  Web service"
+                subprint "Loaded: Web service"
             else
-                subprint "Loading:  Web service  ...ERROR(S)."
+                subprint "Loading: Web service  ...ERROR(S)."
             fi
         fi
@@ -548 +557 @@
             /usr/sbin/svcadm enable -s svc:/application/virtualbox/zoneaccess
             if test "$?" -eq 0; then
-                subprint "Loaded:  Zone access service"
+                subprint "Loaded: Zone access service"
             else
-                subprint "Loading:  Zone access service  ...ERROR(S)."
+                subprint "Loading: Zone access service  ...ERROR(S)."
             fi
         fi
@@ -562 +571 @@
                 INSTALLEDIT=1
                 PYTHONBIN=`which python2.4 2>/dev/null`
-                install_python_bindings "$PYTHONBIN"
+                install_python_bindings "$PYTHONBIN" "Python 2.4"
                 if test "$?" -eq 0; then
                     INSTALLEDIT=0
                 fi
                 PYTHONBIN=`which python2.5 2>/dev/null`
-                install_python_bindings "$PYTHONBIN"
+                install_python_bindings "$PYTHONBIN"  "Python 2.5"
                 if test "$?" -eq 0; then
                     INSTALLEDIT=0
                 fi
                 PYTHONBIN=`which python2.6 2>/dev/null`
-                install_python_bindings "$PYTHONBIN"
+                install_python_bindings "$PYTHONBIN" "Python 2.6"
                 if test "$?" -eq 0; then
                     INSTALLEDIT=0