Changeset 32542 in vbox for trunk/src

Timestamp:

Sep 16, 2010 9:10:46 AM (14 years ago)

Author:

vboxsync

Message:

Linux installer (deb/run): only do kill -USR1 if the vboxweb-service init script is there because only VBoxSVC of these packages will catch SIGUSR1 properly

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/preinst.in (modified) (1 diff)
• routines.sh (modified) (1 diff)

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

@@ -29 +29 @@
   VBOXSVC_PID=`pidof VBoxSVC 2> /dev/null || true`
   if [ -n "$VBOXSVC_PID" ]; then
-    # try graceful termination; terminate the webservice first
-    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-      invoke-rc.d vboxweb-service stop || true
-    else
-      /etc/init.d/vboxweb-service stop || true
+    if [ -f /etc/init.d/vboxweb-service ]; then
+      # try graceful termination; terminate the webservice first
+      if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+        invoke-rc.d vboxweb-service stop || true
+      else
+        /etc/init.d/vboxweb-service stop || true
+      fi
+      kill -USR1 $VBOXSVC_PID
     fi
-    kill -USR1 $VBOXSVC_PID
     sleep 1
     if pidof VBoxSVC > /dev/null 2>&1; then   

trunk/src/VBox/Installer/linux/routines.sh

@@ -98 +98 @@
     VBOXSVC_PID=`pidof VBoxSVC 2> /dev/null`
     if [ -n "$VBOXSVC_PID" ]; then
-        kill -USR1 $VBOXSVC_PID
+        if [ -f /etc/init.d/vboxweb-service ]; then
+            kill -USR1 $VBOXSVC_PID
+        fi
         sleep 1
         if pidof VBoxSVC > /dev/null 2>&1; then