Changeset 42650 in vbox for trunk/src/VBox/Installer

Timestamp:

Aug 7, 2012 8:41:38 AM (13 years ago)

Author:

vboxsync

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

79847

Message:

Installer/deb/rpm: Fix autostart service integration

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/postinst.in (modified) (1 diff)
• debian/rules (modified) (2 diffs)
• rpm/VirtualBox.tmpl.spec (modified) (9 diffs)
• rpm/rules (modified) (1 diff)

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

@@ -142 +142 @@
     fi
   fi
+  if [ -x "/etc/init.d/vboxautostart-service" ]; then
+    update-rc.d vboxautostart-service defaults >/dev/null
+    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+        invoke-rc.d vboxautostart-service start || exit $?
+    else
+        /etc/init.d/vboxautostart-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/rules

@@ -188 +188 @@
         rm -f debian/preinst debian/postinst debian/prerm
         rm -f debian/$(package).init debian/vboxdrv.init
-        rm -f debian/vboxballoonctrl-service.init debian/vboxweb-service.init
+        rm -f debian/vboxballoonctrl-service.init debian/vboxautostart-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
@@ -341 +341 @@
             -e 's|%DEBIAN%|yes|g' \
             -e 's|%PACKAGE%|virtualbox|g' \
+            $(vboxroot)/src/VBox/Installer/linux/vboxautostart-service.sh.in > debian/vboxautostart-service.init
+        dh_installinit --name=vboxautostart-service --noscripts
+        sed \
+            -e 's|%NOLSB%||g' \
+            -e 's|%DEBIAN%|yes|g' \
+            -e 's|%PACKAGE%|virtualbox|g' \
             $(vboxroot)/src/VBox/Installer/linux/vboxweb-service.sh.in > debian/vboxweb-service.init
         dh_installinit --name=vboxweb-service --noscripts

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

@@ -166 +166 @@
 %endif
 install -D -m 755 vboxballoonctrl-service.init $RPM_BUILD_ROOT%{_initrddir}/vboxballoonctrl-service
+install -D -m 755 vboxautostart-service.init $RPM_BUILD_ROOT%{_initrddir}/vboxautostart-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/vboxautostart-service $RPM_BUILD_ROOT/sbin/rcvboxautostart-service
 ln -sf ../etc/init.d/vboxweb-service $RPM_BUILD_ROOT/sbin/rcvboxweb-service
 %endif
@@ -202 +204 @@
     /etc/init.d/vboxballoonctrl-service stop 2>/dev/null || true
   fi
+  if [ -f /etc/init.d/vboxautostart-service ]; then
+    # try graceful termination; terminate the autostart service first
+    /etc/init.d/vboxautostart-service stop 2>/dev/null || true
+  fi
   if [ -f /etc/init.d/vboxweb-service ]; then
     # try graceful termination; terminate the webservice first
@@ -276 +282 @@
 /sbin/chkconfig --add vboxdrv
 /sbin/chkconfig --add vboxballoonctrl-service
+/sbin/chkconfig --add vboxautostart-service
 /sbin/chkconfig --add vboxweb-service
 %endif
 %if %{?rpm_suse:1}%{!?rpm_suse:0}
-%{fillup_and_insserv -f -y -Y vboxdrv vboxballoonctrl-service vboxweb-service}
+%{fillup_and_insserv -f -y -Y vboxdrv vboxballoonctrl-service vboxautostart-service vboxweb-service}
 %endif
 %if %{?rpm_mdv:1}%{!?rpm_mdv:0}
@@ -285 +292 @@
 %_post_service vboxdrv
 %_post_service vboxballoonctrl-service
+%_post_service vboxautostart-service
 %_post_service vboxweb-service
 %update_menus
@@ -330 +338 @@
 fi
 /etc/init.d/vboxballoonctrl-service start > /dev/null
+/etc/init.d/vboxautostart-service start > /dev/null
 /etc/init.d/vboxweb-service start > /dev/null
 
@@ -339 +348 @@
 %if %{?rpm_suse:1}%{!?rpm_suse:0}
 %stop_on_removal vboxballoonctrl-service
+%stop_on_removal vboxautostart-service
 %stop_on_removal vboxweb-service
 %endif
 %if %{?rpm_mdv:1}%{!?rpm_mdv:0}
 %_preun_service vboxballoonctrl-service
+%_preun_service vboxautostart-service
 %_preun_service vboxweb-service
 %endif
@@ -349 +360 @@
   /sbin/service vboxballoonctrl-service stop > /dev/null
   /sbin/chkconfig --del vboxballoonctrl-service
+  /sbin/service vboxautostart-service stop > /dev/null
+  /sbin/chkconfig --del vboxautostart-service
   /sbin/service vboxweb-service stop > /dev/null
   /sbin/chkconfig --del vboxweb-service
@@ -394 +407 @@
   /sbin/service vboxdrv restart > /dev/null 2>&1
   /sbin/service vboxballoonctrl-service restart > /dev/null 2>&1
+  /sbin/service vboxautostart-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 vboxballoonctrl-service vboxweb-service
+%restart_on_update vboxdrv vboxballoonctrl-service vboxautostart-service vboxweb-service
 %insserv_cleanup
 %endif
@@ -424 +438 @@
 %{_initrddir}/vboxdrv
 %{_initrddir}/vboxballoonctrl-service
+%{_initrddir}/vboxautostart-service
 %{_initrddir}/vboxweb-service
 %{?rpm_suse: %{py_sitedir}/*}
 %{!?rpm_suse: %{python_sitelib}/*}
 %{?rpm_suse: /sbin/rcvboxdrv}
-%{?rpm_suse: /sbin/rcvboxballoonctrl-service}
+%{?rpm_suse: /sbin/rcvboxautostart-service}
 %{?rpm_suse: /sbin/rcvboxweb-service}
 /lib/modules

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

@@ -237 +237 @@
             -e 's|%DEBIAN%||g' \
             -e 's|%PACKAGE%|virtualbox|g' \
+            vboxautostart-service.sh.in > $(archdir)/vboxautostart-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)