Changeset 32251 in vbox for trunk/src/VBox/Installer/linux/rpm

Timestamp:

Sep 6, 2010 2:38:46 PM (14 years ago)

Author:

vboxsync

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

65578

Message:

Linux installer: vboxweb-service fixes

File:

• trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (2 diffs)

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -145 +145 @@
 
 # check for active VMs
-if pidof VBoxSVC > /dev/null 2>&1; then
-  echo "A copy of VirtualBox is currently running.  Please close it and try again. Please note"
-  echo "that it can take up to ten seconds for VirtualBox (in particular the VBoxSVC daemon) to"
-  echo "finish running."
-  exit 1
+VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
+if [ -n "$VBOXSVC_PID" ]; then
+  # try graceful termination; terminate the webservice first
+  /etc/init.d/vboxweb-service stop || true
+  kill -USR1 $VBOXSVC_PID
+  sleep 1
+  if pidof VBoxSVC > /dev/null 2>&1; then
+    echo "A copy of VirtualBox is currently running.  Please close it and try again. Please note"
+    echo "that it can take up to ten seconds for VirtualBox (in particular the VBoxSVC daemon) to"
+    echo "finish running."
+    exit 1
+  fi
 fi
 
@@ -305 +312 @@
 %preun
 # check for active VMs
-if pidof VBoxSVC > /dev/null 2>&1; then
-  echo "A copy of VirtualBox is currently running.  Please close it and try again. Please note"
-  echo "that it can take up to ten seconds for VirtualBox (in particular the VBoxSVC daemon) to"
-  echo "finish running."
-  exit 1
+VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
+if [ -n "$VBOXSVC_PID" ]; then
+  # try graceful termination; terminate the webservice first
+  /etc/init.d/vboxweb-service stop || true
+  sleep 1
+  if pidof VBoxSVC > /dev/null 2>&1; then
+    echo "A copy of VirtualBox is currently running.  Please close it and try again. Please note"
+    echo "that it can take up to ten seconds for VirtualBox (in particular the VBoxSVC daemon) to"
+    echo "finish running."
+    exit 1
+  fi
 fi