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

Timestamp:

Jun 9, 2009 9:31:26 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/Installer: fixed and tested ips/pkg(5) post install.

File:

• trunk/src/VBox/Installer/solaris/ipsinstall.sh (modified) (13 diffs)

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

@@ -33 +33 @@
         if test ! -z "$found"; then
             echo "## Failed to find a suitable user id binary."
+            exit 1
         else
             idbin=$found
@@ -40 +41 @@
     if test `$idbin -u` -ne 0; then
         echo "## This script must be run with administrator privileges."
+        exit 2
     fi
 }
@@ -48 +50 @@
     if test "$currentzone" != "global"; then
         echo "## This script must be run from the global zone."
+        exit 3
     fi
 }
@@ -70 +73 @@
 # just updated various boot archive files without really loading
 # them... But we _want_ them to be loaded.
-echo "Removing any stale driver configurations..."
+echo "Removing stale driver configurations..."
 
 $BIN_REMDRV vboxflt > /dev/null 2>&1
@@ -91 +94 @@
     /usr/sbin/devfsadm -i vboxdrv
 
-    echo "HostDrv    : SUCCESS"
-
     # Load VBoxNetAdapter vboxnet
     if test -f /platform/i86pc/kernel/drv/vboxnet.conf; then
@@ -99 +100 @@
 
         if test "$rc" -eq 0; then
-            echo "NetAdapter : SUCCESS"
-
             # nwam/dhcpagent fix
             nwamfile=/etc/nwam/llp
@@ -108 +107 @@
                 echo "vboxnet0  static 192.168.56.1" >> $nwambackupfile
                 mv -f $nwambackupfile $nwamfile
-                echo "  -> patched /etc/nwam/llp to use static IP for vboxnet0"
+                echo "   -> patched /etc/nwam/llp to use static IP for vboxnet0"
             fi
-        else
-            echo "NetAdapter : FAILED"
         fi
     fi
@@ -119 +116 @@
         /opt/VirtualBox/vboxdrv.sh fltstart
         rc=$?
-        if test "$rc" -eq 0; then
-            echo "NetFilter  : SUCCESS"
-        else
-            echo "NetFilter  : FAILED"
-        fi
     fi
 
@@ -138 +130 @@
 
             /usr/sbin/devfsadm -i vboxusbmon
-
-            echo "USBMonitor : SUCCESS"
-        else
-            echo "USBMonitor : FAILED"
         fi
     fi
-else
-    echo "HostDrv    : FAILED"
 fi
 
-# Enable Zone access service
-if test -f /var/svc/manifest/application/virtualbox/zoneaccess.xml; then
-    /usr/sbin/svcadm enable -s svc:/application/virtualbox/zoneaccess
-    echo "Service to use VirtualBox from zones  : ENABLED"
+# Enable Zone access service (note IPS auto-prefixes "virtualbox-" to the filename...)
+if test -f "/var/svc/manifest/application/virtualbox/virtualbox-zoneaccess.xml"; then
+    /usr/sbin/svccfg import /var/svc/manifest/application/virtualbox/virtualbox-zoneaccess.xml
+    rc=$?
+    if test "$rc" -eq 0; then
+        /usr/sbin/svcadm enable -s svc:/application/virtualbox/zoneaccess
+        rc=$?
+        if test "$rc" -eq 0; then
+            echo "Enabled VirtualBox zone service."
+        else
+            echo "## Failed to enable VirtualBox zone service."
+        fi
+    else
+        echo "## Failed to import VirtualBox zone service."
+    fi
 fi
 
@@ -157 +154 @@
 if test -f "/usr/share/applications/virtualbox.desktop"; then
     touch /usr/share/applications/virtualbox.desktop
+    echo "Added VirtualBox shortcut menu item."
 fi
 
@@ -163 +161 @@
     PYTHONBIN=`which python`
     if test -f "$PYTHONBIN" || test -h "$PYTHONBIN"; then
-        echo "Installing Python bindings..."
+        echo "Installing python bindings..."
 
         VBOX_INSTALL_PATH=/opt/VirtualBox
@@ -169 +167 @@
         cd /opt/VirtualBox/sdk/installer
         $PYTHONBIN ./vboxapisetup.py install > /dev/null
+        echo "Done."
     else
         echo "** WARNING! Python not found, skipped installed Python bindings."
@@ -184 +183 @@
 
 echo "Done."
-
+if test "$rc" -eq 0; then
+    echo "Post install successfully completed."
+else
+    echo "Post install completed but with some errors."
+fi
 exit 0