Changeset 32549 in vbox

Timestamp:

Sep 16, 2010 11:30:20 AM (14 years ago)

Author:

vboxsync

Message:

Solaris/Installer: vboxconfig.sh, checkinstall.sh cleanup.

Location:

trunk/src/VBox/Installer/solaris

Files:

• checkinstall.sh (modified) (5 diffs)
• vboxconfig.sh (modified) (6 diffs)

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

@@ -17 +17 @@
 #
 
+infoprint()
+{
+    echo 1>&2 "$1"
+}
+
+errorprint()
+{
+    echo 1>&2 "## $1"
+}
+
 abort_error()
 {
-    echo "## Please close all VirtualBox processes and re-run this installer."
+    errorprint "Please close all VirtualBox processes and re-run this installer."
+    errorprint "Note: It can take up to 10 seconds for all VirtualBox & related processes to close."
     exit 1
 }
@@ -28 +39 @@
 fi
 
-# Check if VBoxSVC is currently running
-VBOXSVC_PID=`ps -eo pid,fname | grep VBoxSVC | grep -v grep | awk '{ print $1 }'`
-if test ! -z "$VBOXSVC_PID" && test "$VBOXSVC_PID" -ge 0; then
-    echo "## VirtualBox's VBoxSVC (pid $VBOXSVC_PID) still appears to be running."
-    abort_error
-fi
-
 # Check if the Zone Access service is holding open vboxdrv, if so stop & remove it
 servicefound=`svcs -H "svc:/application/virtualbox/zoneaccess" 2> /dev/null | grep '^online'`
 if test ! -z "$servicefound"; then
-    echo "## VirtualBox's zone access service appears to still be running."
-    echo "## Halting & removing zone access service..."
+    infoprint "VirtualBox's zone access service appears to still be running."
+    infoprint "Halting & removing zone access service..."
     /usr/sbin/svcadm disable -s svc:/application/virtualbox/zoneaccess
     # Don't delete the service, handled by manifest class action
@@ -48 +52 @@
 servicefound=`svcs -H "svc:/application/virtualbox/webservice" 2> /dev/null | grep '^online'`
 if test ! -z "$servicefound"; then
-    echo "## VirtualBox web service appears to still be running."
-    echo "## Halting & removing webservice..."
+    infoprint "VirtualBox web service appears to still be running."
+    infoprint "Halting & removing webservice..."
     /usr/sbin/svcadm disable -s svc:/application/virtualbox/webservice
     # Don't delete the service, handled by manifest class action
     # /usr/sbin/svccfg delete svc:/application/virtualbox/webservice
+fi
+
+# Check if VBoxSVC is currently running
+VBOXSVC_PID=`ps -eo pid,fname | grep VBoxSVC | grep -v grep | awk '{ print $1 }'`
+if test ! -z "$VBOXSVC_PID" && test "$VBOXSVC_PID" -ge 0; then
+    errorprint "VirtualBox's VBoxSVC (pid $VBOXSVC_PID) still appears to be running."
+    abort_error
+fi
+
+# Check if VBoxNetDHCP is currently running
+VBOXNETDHCP_PID=`ps -eo pid,fname | grep VBoxNetDHCP | grep -v grep | awk '{ print $1 }'`
+if test ! -z "VBOXNETDHCP_PID" && test "VBOXNETDHCP_PID" -ge 0; then
+    errorprint "VirtualBox's VBoxNetDHCP (pid $VBOXNETDHCP_PID) still appears to be running."
+    abort_error
 fi
 
@@ -60 +78 @@
     vboxnetup=`$BIN_IFCONFIG vboxnet0 >/dev/null 2>&1`
     if test "$?" -eq 0; then
-        echo "## VirtualBox NetAdapter is still plumbed"
-        echo "## Trying to remove old NetAdapter..."
+        infoprint "VirtualBox NetAdapter is still plumbed"
+        infoprint "Trying to remove old NetAdapter..."
         $BIN_IFCONFIG vboxnet0 unplumb
         if test "$?" -ne 0; then
-            echo "## VirtualBox NetAdapter 'vboxnet0' couldn't be unplumbed (probably in use)."
+            errorprint "VirtualBox NetAdapter 'vboxnet0' couldn't be unplumbed (probably in use)."
             abort_error
         fi
@@ -70 +88 @@
     vboxnetup=`$BIN_IFCONFIG vboxnet0 inet6 >/dev/null 2>&1`
     if test "$?" -eq 0; then
-        echo "## VirtualBox NetAdapter (Ipv6) is still plumbed"
-        echo "## Trying to remove old NetAdapter..."
+        infoprint "VirtualBox NetAdapter (Ipv6) is still plumbed"
+        infoprint "Trying to remove old NetAdapter..."
         $BIN_IFCONFIG vboxnet0 inet6 unplumb
         if test "$?" -ne 0; then
-            echo "## VirtualBox NetAdapter 'vboxnet0' IPv6 couldn't be unplumbed (probably in use)."
+            errorprint "VirtualBox NetAdapter 'vboxnet0' IPv6 couldn't be unplumbed (probably in use)."
             abort_error
         fi

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

@@ -42 +42 @@
 BIN_SVCS=/usr/bin/svcs
 BIN_ID=/usr/bin/id
+BIN_PKILL=/usr/bin/pkill
 
 # "vboxdrv" is also used in sed lines here (change those as well if it ever changes)
@@ -106 +107 @@
 {
     helpprint "VirtualBox Configuration Script"
-    helpprint "usage: $0 operation [options]"
+    helpprint "usage: $0 <operation> [options]"
     helpprint
-    helpprint "operation must be one of the following:"
-    helpprint "  --postinstall           Perform full post installation procedure"
-    helpprint "  --preremove             Perform full pre remove procedure"
-    helpprint "  --installdrivers        Only install the drivers"
-    helpprint "  --removedrivers         Only remove the drivers"
-    helpprint "  --setupdrivers          Set up drivers, reloads any existing drivers"
+    helpprint "<operation> must be one of the following:"
+    helpprint "  --postinstall      Perform full post installation procedure"
+    helpprint "  --preremove        Perform full pre remove procedure"
+    helpprint "  --installdrivers   Only install the drivers"
+    helpprint "  --removedrivers    Only remove the drivers"
+    helpprint "  --setupdrivers     Setup drivers, reloads existing drivers"
     helpprint
     helpprint "[options] are one or more of the following:"
-    helpprint "  --silent                Silent mode"
-    helpprint "  --fatal                 Make failures fatal, don't continue"
-    helpprint "  --ips                   An IPS package installation"
-    helpprint "  --altkerndir            Use /usr/kernel/drv as the driver directory"
+    helpprint "  --silent           Silent mode"
+    helpprint "  --fatal            Don't continue on failure (required for postinstall)"
+    helpprint "  --ips              This is an IPS package postinstall/preremove"
+    helpprint "  --altkerndir       Use /usr/kernel/drv as the driver directory"
+    helpprint
 }
 
@@ -193 +195 @@
     if test ! -x "$BIN_IFCONFIG"; then
         BIN_IFCONFIG=`find_bin_path "$BIN_IFCONFIG"`
+    fi
+
+    if test ! -x "$BIN_PKILL"; then
+        BIN_PKILL=`find_bin_path "$BIN_PKILL"`
     fi
 }
@@ -532 +538 @@
 }
 
-# remove_all([fatal])
+# remove_drivers([fatal])
 # failure: depends on [fatal]
 remove_drivers()
@@ -627 +633 @@
     fi
     return 1
+}
+
+# stop_process(processname)
+# failure: depends on [fatal]
+stop_process()
+{
+    if test -z "$1"; then
+        errorprint "missing argument to stop_process()"
+        exit 1
+    fi
+
+    procname=$1
+    procpid=`ps -eo pid,fname | grep $PROC_NAME | grep -v grep | awk '{ print $1 }'`
+    if test ! -z "procpid" && test "procpid" -ge 0; then
+        $BIN_PKILL "$procname"
+        sleep 2
+        procpid=`ps -eo pid,fname | grep $PROC_NAME | grep -v grep | awk '{ print $1 }'`
+        if test ! -z "procpid" && test "procpid" -ge 0; then
+            subprint "Terminating: $procname  ...FAILED!"
+            if test "$fatal" = "$FATALOP"; then
+                exit 1
+            fi
+        else
+            subprint "Terminated: $procname"
+        fi
+    fi
 }
 
@@ -695 +727 @@
         inst=`expr $inst + 1`
     done
+
+    # Stop our other daemons, non-fatal
+    stop_process VBoxSVC
+    stop_process VBoxNetDHCP
 }