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

Timestamp:

May 28, 2015 9:21:52 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100646

Message:

Solaris/Installer: attempt fixing sabotaging SMF database updates with querying svcs repeatedly on checkinstall phase.

File:

• trunk/src/VBox/Installer/solaris/checkinstall.sh (modified) (3 diffs)

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

@@ -6 +6 @@
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -124 +124 @@
 servicefound=`svcs -H "svc:/application/virtualbox/zoneaccess" 2> /dev/null | grep '^online'`
 if test ! -z "$servicefound"; then
-    infoprint "VirtualBox's zone access service appears to still be running."
+    infoprint "VirtualBox zone access service appears to still be running."
     infoprint "Halting & removing zone access service..."
     /usr/sbin/svcadm disable -s svc:/application/virtualbox/zoneaccess
@@ -195 +195 @@
 fi
 
-# If we are using SVR4 packages then make sure that SMF has finished
-# disabling any services left over from a previous installation which
-# may interfere with installing new ones.  Should only be relevant on
-# Solaris 11.
-if test -x "$BIN_PKGINFO"; then
-    for i in 1 2 3 4 5 6 7 8 9 10; do
-        svcs -a | grep virtualbox >/dev/null || break
-        if test "${i}" = "1"; then
-            printf "Waiting for services from previous installation to be removed."
-        else
-            printf "."
-        fi
-        sleep 1
-    done
-    test "${i}" = "1" || printf "\n"
-fi
+# Make sure that SMF has finished removing any services left over from a
+# previous installation which may interfere with installing new ones.
+# This is only relevant on Solaris 11 for SysV packages.
+#
+# See BugDB 14838646 for the original problem and @bugref{7866} for
+# follow up fixes.
+for i in 1 2 3 4 5 6 7 8 9 10; do
+    svcs -H "svc:/application/virtualbox/autostart"  >/dev/null 2>&1 ||
+    svcs -H "svc:/application/virtualbox/webservice" >/dev/null 2>&1 ||
+    svcs -H "svc:/application/virtualbox/zoneaccess" >/dev/null 2>&1 || break
+    if test "${i}" = "1"; then
+        printf "Waiting for services from previous installation to be removed."
+    elif test "${i}" = "10"; then
+        printf "\nWarning!!! Some service(s) still appears to not be removed completely!"
+    else
+        printf "."
+    fi
+    sleep 1
+done
+test "${i}" = "1" || printf "\n"
 
 exit 0