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

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/rpm

Files:

• VirtualBox.tmpl.spec (modified) (11 diffs)
• rules (modified) (2 diffs)

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

@@ -4 +4 @@
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -105 +105 @@
 rmdir icons
 mv virtualbox.xml $RPM_BUILD_ROOT/usr/share/mime/packages
-for i in VBoxManage VBoxSVC VBoxSDL VirtualBox VBoxHeadless VBoxExtPackHelperApp vboxwebsrv webtest; do
+for i in VBoxManage VBoxSVC VBoxSDL VirtualBox VBoxHeadless VBoxExtPackHelperApp VBoxBalloonCtrl vboxwebsrv webtest; do
   mv $i $RPM_BUILD_ROOT/usr/lib/virtualbox; done
 for i in VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl; do
@@ -138 +138 @@
 ln -sf ../etc/init.d/vboxdrv $RPM_BUILD_ROOT/sbin/rcvboxdrv
 %endif
+install -D -m 755 vboxballoonctrl-service.init $RPM_BUILD_ROOT%{_initrddir}/vboxballoonctrl-service
 install -D -m 755 vboxweb-service.init $RPM_BUILD_ROOT%{_initrddir}/vboxweb-service
 %if %{?rpm_suse:1}%{!?rpm_suse:0}
+ln -sf ../etc/init.d/vboxballoonctrl-service $RPM_BUILD_ROOT/sbin/rcvboxballoonctrl-service
 ln -sf ../etc/init.d/vboxweb-service $RPM_BUILD_ROOT/sbin/rcvboxweb-service
 %endif
@@ -151 +153 @@
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxHeadless
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxheadless
+ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxBalloonCtrl
+ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxballoonctrl
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxwebsrv
 ln -s /usr/share/virtualbox/src/vboxhost $RPM_BUILD_ROOT/usr/src/vboxhost-%VER%
@@ -165 +169 @@
 if [ -n "$VBOXSVC_PID" ]; then
   # executed before the new package is installed!
+  if [ -f /etc/init.d/vboxballoonctrl-service ]; then
+    # try graceful termination; terminate the balloon control service first
+    /etc/init.d/vboxballoonctrl-service stop 2>/dev/null || true
+  fi
   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
+  fi
+  # ask the daemon to terminate immediately
+  kill -USR1 $VBOXSVC_PID
   sleep 1
   if pidof VBoxSVC > /dev/null 2>&1; then
@@ -275 +283 @@
   chcon -t java_exec_t    /usr/lib/virtualbox/VBoxHeadless > /dev/null 2>&1
   chcon -t java_exec_t    /usr/lib/virtualbox/VBoxExtPackHelperApp > /dev/null 2>&1
+  chcon -t java_exec_t    /usr/lib/virtualbox/VBoxBalloonCtrl > /dev/null 2>&1
   chcon -t java_exec_t    /usr/lib/virtualbox/vboxwebsrv > /dev/null 2>&1
 fi
@@ -288 +297 @@
 %if %{?rpm_redhat:1}%{!?rpm_redhat:0}
 /sbin/chkconfig --add vboxdrv
+/sbin/chkconfig --add vboxballoonctrl-service
 /sbin/chkconfig --add vboxweb-service
 %endif
 %if %{?rpm_suse:1}%{!?rpm_suse:0}
-%{fillup_and_insserv -f -y -Y vboxdrv vboxweb-service}
+%{fillup_and_insserv -f -y -Y vboxdrv vboxballoonctrl-service vboxweb-service}
 %endif
 %if %{?rpm_mdv:1}%{!?rpm_mdv:0}
 /sbin/ldconfig
 %_post_service vboxdrv
+%_post_service vboxballoonctrl-service
 %_post_service vboxweb-service
 %update_menus
@@ -339 +350 @@
   /etc/init.d/vboxdrv start > /dev/null
 fi
+/etc/init.d/vboxballoonctrl-service start > /dev/null
 /etc/init.d/vboxweb-service start > /dev/null
 
@@ -347 +359 @@
 # $1>=2: upgrade
 %if %{?rpm_suse:1}%{!?rpm_suse:0}
+%stop_on_removal vboxballoonctrl-service
 %stop_on_removal vboxweb-service
 %endif
 %if %{?rpm_mdv:1}%{!?rpm_mdv:0}
+%_preun_service vboxballoonctrl-service
 %_preun_service vboxweb-service
 %endif
 %if %{?rpm_redhat:1}%{!?rpm_redhat:0}
 if [ "$1" = 0 ]; then
+  /sbin/service vboxballoonctrl-service stop > /dev/null
+  /sbin/chkconfig --del vboxballoonctrl-service
   /sbin/service vboxweb-service stop > /dev/null
   /sbin/chkconfig --del vboxweb-service
@@ -400 +416 @@
 if [ "$1" -ge 1 ]; then
   /sbin/service vboxdrv restart > /dev/null 2>&1
+  /sbin/service vboxballoonctrl-service restart > /dev/null 2>&1
   /sbin/service vboxweb-service restart > /dev/null 2>&1
 fi
 %endif
 %if %{?rpm_suse:1}%{!?rpm_suse:0}
-%restart_on_update vboxdrv vboxweb-service
+%restart_on_update vboxdrv vboxballoonctrl-service vboxweb-service
 %insserv_cleanup
 %endif
@@ -428 +445 @@
 %doc VirtualBox*.chm
 %{_initrddir}/vboxdrv
+%{_initrddir}/vboxballoonctrl-service
 %{_initrddir}/vboxweb-service
 %{?rpm_suse: %{py_sitedir}/*}
 %{!?rpm_suse: %{python_sitelib}/*}
 %{?rpm_suse: /sbin/rcvboxdrv}
+%{?rpm_suse: /sbin/rcvboxballoonctrl-service}
 %{?rpm_suse: /sbin/rcvboxweb-service}
 /lib/modules

trunk/src/VBox/Installer/linux/rpm/rules

@@ -2 +2 @@
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -182 +182 @@
            -e 's|%DEBIAN%||g' \
            -e 's|%PACKAGE%|virtualbox|g' \
+           vboxballoonctrl-service.sh.in > $(archdir)/vboxballoonctrl-service.init
+        sed \
+           -e 's|%NOLSB%|yes|g' \
+           -e 's|%DEBIAN%||g' \
+           -e 's|%PACKAGE%|virtualbox|g' \
            vboxweb-service.sh.in > $(archdir)/vboxweb-service.init
         cp debian/VBox.sh $(archdir)