diff -u daemontools-0.76/debian/changelog daemontools-0.76/debian/changelog --- daemontools-0.76/debian/changelog +++ daemontools-0.76/debian/changelog @@ -1,3 +1,16 @@ +daemontools (1:0.76-3ubuntu1) jaunty-proposed; urgency=low + + * debian/control + - updated description of daemontools-run + * debian/daemontools-run.* + - updated to use upstart (LP: #253465) + * debian/rules + - install svscan-file to /etc/event.d + * debian/svscan + - service-file for upstart + + -- Andreas Moog Mon, 27 Apr 2009 03:23:53 +0200 + daemontools (1:0.76-3) unstable; urgency=low * debian/daemontools-run.postinst: don't exec into the kill program, so diff -u daemontools-0.76/debian/control daemontools-0.76/debian/control --- daemontools-0.76/debian/control +++ daemontools-0.76/debian/control @@ -1,7 +1,8 @@ Source: daemontools Section: admin Priority: optional -Maintainer: Gerrit Pape +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Gerrit Pape Standards-Version: 3.7.3.0 Package: daemontools @@ -27,3 +28,3 @@ Description: daemontools service supervision - Starts svscanboot from inittab, and provides the directory /etc/service/ + Starts svscanboot, and provides the directory /etc/service/ for services to be supervised by daemontools. diff -u daemontools-0.76/debian/daemontools-run.README.Debian daemontools-0.76/debian/daemontools-run.README.Debian --- daemontools-0.76/debian/daemontools-run.README.Debian +++ daemontools-0.76/debian/daemontools-run.README.Debian @@ -4,10 +4,9 @@ -This package provides the service directory /etc/service/, adds an -entry with the name SV to /etc/inittab in order to provide service -supervision on systems running sysvinit as init scheme, and includes -the update-service(8) program. +This package provides the service directory /etc/service/, adds the +required files to automatically start at boottime under upstart, and +includes the update-service(8) program. When adding or removing services to or from daemontools' system-wide service supervision, update-service(8) should be used, instead of manipulating symbolic links in /etc/service/ directly. - -- Gerrit Pape , Mon, 07 Jan 2008 18:26:56 +0000 + -- Andreas Moog , Mon, 27 Apr 2009 03:40:26 +0000 diff -u daemontools-0.76/debian/daemontools-run.postinst daemontools-0.76/debian/daemontools-run.postinst --- daemontools-0.76/debian/daemontools-run.postinst +++ daemontools-0.76/debian/daemontools-run.postinst @@ -1,8 +1,6 @@ #!/bin/sh set -e -test "$1" = 'configure' || exit 0 - if test -z "$2" || dpkg --compare-versions "$2" lt '1:0.76'; then test -n "$(ls -1 /etc/service/)" || for i in /var/service /service /var/lib/svscan; do @@ -18,59 +16,8 @@ done - # upgrade from unofficial daemontools-run - if grep -q '#-- daemontools-run begin' /etc/inittab; then - echo 'Removing SV inittab entry...' - rm -f /etc/inittab'{new}' - sed -e '/#-- daemontools-run begin/,/#-- daemontools-run end/d' \ - /etc/inittab > /etc/inittab'{new}' - mv -f /etc/inittab'{new}' /etc/inittab - kill -s HUP 1 - sleep 1 - fi - # update from daemontools-installer - if grep -q 'SV:123456:respawn:/command/svscanboot' /etc/inittab; then - echo 'Removing SV inittab entry...' - rm -f /etc/inittab'{new}' - sed -e '/SV:123456:respawn:\/command\/svscanboot/d' \ - /etc/inittab > /etc/inittab'{new}' - mv -f /etc/inittab'{new}' /etc/inittab - kill -s HUP 1 - sleep 1 - fi - # update from daemontools-installer (fhs version) - if grep -q 'SV:123456:respawn:/usr/bin/svscanboot' /etc/inittab; then - echo 'Removing SV inittab entry...' - rm -f /etc/inittab'{new}' - sed -e '/SV:123456:respawn:\/usr\/bin\/svscanboot/d' \ - /etc/inittab > /etc/inittab'{new}' - mv -f /etc/inittab'{new}' /etc/inittab - kill -s HUP 1 - sleep 1 - fi -fi -if test -z "$2"; then - # not upgrading - if grep '^SV:' /etc/inittab >/dev/null; then - cat <<-\EOT >&2 - - There already is an SV entry in /etc/inittab. In order to have this - package add an entry with the name SV to have daemontools' service - supervision started through sysvinit, you need to remove or rename - the current SV entry first. - - Installation failed. - - EOT - exit 1 - fi fi -if ! grep '^SV:' /etc/inittab >/dev/null; then - echo 'Adding SV inittab entry...' - cp /etc/inittab /etc/inittab'{new}' - cat >>/etc/inittab'{new}' <<-\EOT - #-- daemontools-run begin - SV:123456:respawn:/usr/bin/svscanboot - #-- daemontools-run end - EOT - mv -f /etc/inittab'{new}' /etc/inittab - kill -s HUP 1 + +if test -f /etc/event.d/svscan + then + echo 'Starting svscan-service' + /sbin/start svscan fi reverted: --- daemontools-0.76/debian/daemontools-run.postrm +++ daemontools-0.76.orig/debian/daemontools-run.postrm @@ -1,18 +0,0 @@ -#!/bin/sh -set -e - -test "$1" = 'remove' || exit 0 - -if grep -q "#-- daemontools-run begin" /etc/inittab; then - echo 'Removing SV inittab entry...' - rm -f /etc/inittab'{new}' - sed -e '/#-- daemontools-run begin/,/#-- daemontools-run end/d' \ - /etc/inittab > /etc/inittab'{new}' - mv -f /etc/inittab'{new}' /etc/inittab - kill -s HUP 1 || : - echo 'Sending services the TERM and CONT signals...' - svc -dx /etc/service/* || : - sleep 5 - echo 'Sending log services the TERM and CONT signals...' - svc -dx /etc/service/*/log || : -fi diff -u daemontools-0.76/debian/rules daemontools-0.76/debian/rules --- daemontools-0.76/debian/rules +++ daemontools-0.76/debian/rules @@ -65,6 +65,9 @@ gzip -9 '$(DIR)'-run/usr/share/man/man8/update-service.8 # changelog test -r changelog || ln -s daemontools-0.76/src/CHANGES changelog + # upstart-files + mkdir -p '$(DIR)'-run/etc/event.d/ + install -m0644 debian/svscan '$(DIR)'-run/etc/event.d/ binary: binary-arch binary-indep binary-arch: install-arch daemontools.deb only in patch2: unchanged: --- daemontools-0.76.orig/debian/daemontools-run.preinst +++ daemontools-0.76/debian/daemontools-run.preinst @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if test -f /etc/event.d/svscan + then + echo 'Stopping svscan-service' + /sbin/stop svscan +fi only in patch2: unchanged: --- daemontools-0.76.orig/debian/svscan +++ daemontools-0.76/debian/svscan @@ -0,0 +1,16 @@ +# svscan - daemontools +# +# This service starts daemontools from the point the system is +# started until it is shut down again. + +start on runlevel 1 +start on runlevel 2 +start on runlevel 3 +start on runlevel 4 +start on runlevel 5 +start on runlevel 6 + +stop on shutdown + +respawn +exec /usr/bin/svscanboot only in patch2: unchanged: --- daemontools-0.76.orig/debian/daemontools-run.prerm +++ daemontools-0.76/debian/daemontools-run.prerm @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +test "$1" = 'remove' || exit 0 + +if test -f /etc/event.d/svscan + then + echo 'Stopping svscan-service' + /sbin/stop svscan +fi