Changeset 20494 in vbox for trunk

Timestamp:

Jun 12, 2009 10:05:39 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/Installer: ipsinstall error handling.

File:

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

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

@@ -90 +90 @@
     # Create the device link
     /usr/sbin/devfsadm -i vboxdrv
-
-    # Load VBoxNetAdapter vboxnet
-    if test -f /platform/i86pc/kernel/drv/vboxnet.conf; then
-        /opt/VirtualBox/vboxdrv.sh netstart
-        rc=$?
-
-        if test "$rc" -eq 0; then
-            # nwam/dhcpagent fix
-            nwamfile=/etc/nwam/llp
-            nwambackupfile=$nwamfile.vbox
-            if test -f "$nwamfile"; then
-                sed -e '/vboxnet/d' $nwamfile > $nwambackupfile
-                echo "vboxnet0  static 192.168.56.1" >> $nwambackupfile
-                mv -f $nwambackupfile $nwamfile
-                echo "   -> patched /etc/nwam/llp to use static IP for vboxnet0"
+    rc=$?
+
+    if test "$rc" -eq 0; then
+        # Load VBoxNetAdapter vboxnet
+        if test -f /platform/i86pc/kernel/drv/vboxnet.conf; then
+            /opt/VirtualBox/vboxdrv.sh netstart
+            rc=$?
+
+            if test "$rc" -eq 0; then
+                # nwam/dhcpagent fix
+                nwamfile=/etc/nwam/llp
+                nwambackupfile=$nwamfile.vbox
+                if test -f "$nwamfile"; then
+                    sed -e '/vboxnet/d' $nwamfile > $nwambackupfile
+                    echo "vboxnet0      static 192.168.56.1" >> $nwambackupfile
+                    mv -f $nwambackupfile $nwamfile
+                    echo "   -> patched /etc/nwam/llp to use static IP for vboxnet0"
+                fi
             fi
         fi
+    else
+        echo "## Failed to create device link in /dev for vboxdrv"
     fi
 
     # Load VBoxNetFilter vboxflt
-    if test -f /platform/i86pc/kernel/drv/vboxflt.conf; then
+    if test "$rc" -eq 0 && test -f /platform/i86pc/kernel/drv/vboxflt.conf; then
         /opt/VirtualBox/vboxdrv.sh fltstart
         rc=$?
@@ -116 +121 @@
 
     # Load VBoxUSBMonitor vboxusbmon (do NOT load for Solaris 10)
-    if test -f /platform/i86pc/kernel/drv/vboxusbmon.conf && test "$osversion" != "5.10"; then
+    if test "$rc" -eq 0 && test -f /platform/i86pc/kernel/drv/vboxusbmon.conf && test "$osversion" != "5.10"; then
         /opt/VirtualBox/vboxdrv.sh usbstart
         rc=$?
@@ -127 +132 @@
 
             /usr/sbin/devfsadm -i vboxusbmon
-        fi
-    fi
-fi
-
+            rc=$?
+            if test "$rc" -ne 0; then
+                echo "## Failed to create device link in /dev for vboxusbmon"
+            fi
+        fi
+    fi
+fi
+
+rc2=0
 # 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
+    rc2=$?
+    if test "$rc2" -eq 0; then
         /usr/sbin/svcadm enable -s svc:/application/virtualbox/zoneaccess
-        rc=$?
-        if test "$rc" -eq 0; then
+        rc2=$?
+        if test "$rc2" -eq 0; then
             echo "Enabled VirtualBox zone service."
         else
@@ -155 +165 @@
 
 # Install python bindings
+rc3=0
 if test -f "/opt/VirtualBox/sdk/installer/vboxapisetup.py" || test -h "/opt/VirtualBox/sdk/installer/vboxapisetup.py"; then
     PYTHONBIN=`which python`
@@ -164 +175 @@
         cd /opt/VirtualBox/sdk/installer
         $PYTHONBIN ./vboxapisetup.py install > /dev/null
+        rc3=$?
         echo "Done."
     else
@@ -169 +181 @@
         echo "   Manually run '/opt/VirtualBox/sdk/installer/vboxapisetup.py install'"
         echo "   to install the bindings when python is available."
-    fi
-fi
-
-# Update boot archive
-BOOTADMBIN=/sbin/bootadm
-if test -f "$BOOTADMBIN" || test -h "$BOOTADMBIN"; then
-    echo "Updating boot archive..."
-    $BOOTADMBIN update-archive > /dev/null
+        rc3=1
+    fi
+fi
+
+# Update boot archive (only when driver's were all successfully loaded)
+rc4=0
+if test "$rc" -eq 0; then
+    BOOTADMBIN=/sbin/bootadm
+    if test -f "$BOOTADMBIN" || test -h "$BOOTADMBIN"; then
+        echo "Updating boot archive..."
+        $BOOTADMBIN update-archive > /dev/null
+        rc4=$?
+    fi
 fi
 
 echo "Done."
-if test "$rc" -eq 0; then
+if test "$rc" -eq 0 && test "$rc2" -eq 0 && test "$rc3" -eq 0 && test "$rc4" -eq 0; then
     echo "Post install successfully completed."
 else
     echo "Post install completed but with some errors."
-fi
-exit 0
-
+    # 20 - partially failed installed
+    $rc=20
+fi
+exit $rc
+