Changeset 32517 in vbox for trunk/src

Timestamp:

Sep 15, 2010 1:06:40 PM (14 years ago)

Author:

vboxsync

Message:

deb/rpm: fixed test for running VBoxSVC instances (don't execute _after_ upgrade); don't stop the vboxdrv module before we rebuild it (/etc/init.d/vboxdrv setup); do kill -USR1 only if vboxweb-service exists because this signal will terminate old VBoxSVC daemons unconditionally

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/postinst.in (modified) (2 diffs)
• rpm/VirtualBox.tmpl.spec (modified) (5 diffs)

trunk/src/VBox/Installer/linux/debian/postinst.in

@@ -127 +127 @@
     update-rc.d vboxdrv defaults >/dev/null
 
-    # There might be an old module active (e.g. manually loaded)
-    if lsmod | grep -q "vboxdrv[^_-]"; then
-      /etc/init.d/vboxdrv stop || true
-    fi
-
     BUILD_MODULES=0
     REGISTER_MODULES=1
@@ -163 +158 @@
     else
       # shipped modules found, register sources at DKMS anyway
+      if lsmod | grep -q "vboxdrv[^_-]"; then
+        /etc/init.d/vboxdrv stop || true
+      fi
       if [ $REGISTER_MODULES -eq 1 ]; then
         DKMS=`which dkms 2>/dev/null`

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

@@ -144 +144 @@
 [ -r /etc/default/virtualbox ] && . /etc/default/virtualbox
 
-# check for active VMs
+# check for active VMs of the installed (old) package
 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
+  # executed before the new package is installed!
+  if [ -f /etc/init.d/vboxweb-service ]; then
+    # try graceful termination; terminate the webservice first
+    /etc/init.d/vboxweb-service stop 2>/dev/null || true
+    # ask the daemon to terminate immediately
+    kill -USR1 $VBOXSVC_PID
+  fi
   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."
+    echo "A copy of VirtualBox is currently running.  Please close it and try again."
+    echo "Please note that it can take up to ten seconds for VirtualBox (in particular"
+    echo "the VBoxSVC daemon) to finish running."
     exit 1
   fi
@@ -292 +296 @@
   rm -f /lib/modules/*/misc/vboxnetadp.ko
 fi
-if lsmod | grep -q "vboxdrv[^_-]"; then
-  /etc/init.d/vboxdrv stop || true
-fi
 if [ $BUILD_MODULES -eq 1 ]; then
   /etc/init.d/vboxdrv setup || true
 else
+  if lsmod | grep -q "vboxdrv[^_-]"; then
+    /etc/init.d/vboxdrv stop || true
+  fi
   if [ $REGISTER_MODULES -eq 1 ]; then
     DKMS=`which dkms 2>/dev/null`
@@ -310 +314 @@
 
 %preun
+# $1==0: remove the last version of the package
+# $1==1: install the first time
+# $1>=2: upgrade
 %if %{?rpm_suse:1}%{!?rpm_suse:0}
 %stop_on_removal vboxweb-service
@@ -322 +329 @@
 fi
 %endif
-# check for active VMs
-VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
-if [ -n "$VBOXSVC_PID" ]; then
-  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
+
+if [ "$1" = 0 ]; then
+  # check for active VMs
+  VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
+  if [ -n "$VBOXSVC_PID" ]; then
+    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."
+      echo "Please note that it can take up to ten seconds for VirtualBox (in particular"
+      echo "the VBoxSVC daemon) to finish running."
+      exit 1
+    fi
   fi
 fi
@@ -363 +373 @@
 %endif
 %if %{?rpm_suse:1}%{!?rpm_suse:0}
-%restart_on_update vboxdrv
-%restart_on_update vboxweb-service
+%restart_on_update vboxdrv vboxweb-service
 %insserv_cleanup
 %endif