Changeset 36714 in vbox for trunk/src/VBox/Installer/linux/debian

Timestamp:

Apr 18, 2011 1:18:33 PM (14 years ago)

Author:

vboxsync

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

71230

Message:

Installer/linux: debian and rpm packaging of VBoxBalloonCtrl

Location:

trunk/src/VBox/Installer/linux/debian

Files:

• VBox.sh (modified) (2 diffs)
• lintian-override.in (modified) (1 diff)
• postinst.in (modified) (3 diffs)
• preinst.in (modified) (3 diffs)
• prerm.in (modified) (1 diff)
• rules (modified) (5 diffs)

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

@@ -3 +3 @@
 # Oracle VM VirtualBox
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -89 +89 @@
     exec "/usr/lib/virtualbox/vboxwebsrv" "$@"
     ;;
+  VBoxBalloonCtrl|vboxballoonctrl)
+    exec "/usr/lib/virtualbox/VBoxBalloonCtrl" "$@"
+    ;;
   *)
     echo "Unknown application - $APP"

trunk/src/VBox/Installer/linux/debian/lintian-override.in

@@ -89 +89 @@
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/components/VBoxXPCOMIPCC.so /usr/lib/virtualbox
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/kchmviewer /usr/lib/virtualbox
+%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxBalloonCtrl /usr/lib/virtualbox
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/vboxwebsrv /usr/lib/virtualbox
 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/webtest /usr/lib/virtualbox

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

@@ -1 +1 @@
 #!/bin/sh
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -129 +129 @@
 
 if [ "$1" = "configure" ]; then
-  # Start vboxdrv/vboxweb-service manually as we use our own error handling in postrm
+  # Start vboxdrv/vboxballoonctrl/vboxweb-service manually as we use our own error handling in postrm
   if [ -x "/etc/init.d/vboxdrv" ]; then
     update-rc.d vboxdrv defaults >/dev/null
@@ -180 +180 @@
     fi
   fi
+  if [ -x "/etc/init.d/vboxballoonctrl-service" ]; then
+    update-rc.d vboxballoonctrl-service defaults >/dev/null
+    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+        invoke-rc.d vboxballoonctrl-service start || exit $?
+    else
+        /etc/init.d/vboxballoonctrl-service start || exit $?
+    fi
+  fi
   if [ -x "/etc/init.d/vboxweb-service" ]; then
     update-rc.d vboxweb-service defaults >/dev/null

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

@@ -1 +1 @@
 #!/bin/bash
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -29 +29 @@
   VBOXSVC_PID=`pidof VBoxSVC 2> /dev/null || true`
   if [ -n "$VBOXSVC_PID" ]; then
+    if [ -f /etc/init.d/vboxballoonctrl-service ]; then
+      # try graceful termination; terminate the ballon control service first
+      if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+        invoke-rc.d vboxballoonctrl-service stop || true
+      else
+        /etc/init.d/vboxballoonctrl-service stop || true
+      fi
+    fi
     if [ -f /etc/init.d/vboxweb-service ]; then
       # try graceful termination; terminate the webservice first
@@ -36 +44 @@
         /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/debian/prerm.in

@@ -38 +38 @@
   VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null`
   if [ -n "$VBOXSVC_PID" ]; then
+    # try graceful termination; terminate the balloon control servic first
+    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+      invoke-rc.d vboxballoonctrl-service stop || true
+    else
+      /etc/init.d/vboxballoonctrl-service stop || true
+    fi
     # try graceful termination; terminate the webservice first
     if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then

trunk/src/VBox/Installer/linux/debian/rules

@@ -1 +1 @@
 #!/usr/bin/make -f
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -178 +178 @@
         dh_testroot
         rm -f debian/changelog debian/preinst debian/postinst debian/prerm
-        rm -f debian/$(package).init debian/vboxdrv.init debian/vboxweb-service.init
+        rm -f debian/$(package).init debian/vboxdrv.init
+        rm -f debian/vboxballoonctrl-service.init debian/vboxweb-service.init
         rm -f debian/AutoConfig.kmk debian/configure.log debian/env.sh
         rm -f debian/modules-stamp debian/build-stamp debian/configure-stamp
@@ -249 +250 @@
         for i in VBoxManage VBoxSVC $(if $(HEADLESS),,VBoxSDL) \
             $(if $(NOQT),,VirtualBox) VBoxHeadless \
-            VBoxExtPackHelperApp \
+            VBoxExtPackHelperApp VBoxBalloonCtrl \
             $(if $(NOWEBSVC),,vboxwebsrv webtest); do \
             mv $(archdir)/$$i $(prefix)/usr/lib/$(package); done
@@ -295 +296 @@
             usr/bin/VBox                        usr/bin/VBoxHeadless \
             usr/bin/VBox                        usr/bin/vboxheadless \
+            usr/bin/VBox                        usr/bin/VBoxBalloonCtrl \
+            usr/bin/VBox                        usr/bin/vboxballoonctrl \
             $(if $(NOWEBSVC),,usr/bin/VBox      usr/bin/vboxwebsrv) \
             usr/share/virtualbox/src/vboxhost   usr/src/vboxhost-$(ver)
@@ -306 +309 @@
             $(vboxroot)/src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init
         dh_installinit --name=vboxdrv --noscripts
+        sed \
+            -e 's|%NOLSB%||g' \
+            -e 's|%DEBIAN%|yes|g' \
+            -e 's|%PACKAGE%|virtualbox|g' \
+            $(vboxroot)/src/VBox/Installer/linux/vboxballoonctrl-service.sh.in > debian/vboxballoonctrl-service.init
+        dh_installinit --name=vboxballoonctrl-service --noscripts
         sed \
             -e 's|%NOLSB%||g' \