From 90dbf631b3e901a57314ff5d3a299ee5450457ff Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Thu, 17 Dec 2009 17:29:59 -0500 Subject: [PATCH] Use the systemv init script instead of an upstart job. Hardy's upstart apparently can't detect newly installed jobs without a reboot. svn path=/trunk/packages/invirt-dev/; revision=2627 --- debian/invirt-dev.dirs | 1 - debian/invirt-dev.init | 12 +++++++++++- debian/invirt-dev.upstart | 12 ------------ debian/rules | 3 --- 4 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 debian/invirt-dev.upstart diff --git a/debian/invirt-dev.dirs b/debian/invirt-dev.dirs index 6e9b8ce..a17355d 100644 --- a/debian/invirt-dev.dirs +++ b/debian/invirt-dev.dirs @@ -1,4 +1,3 @@ -etc/event.d var/lib/invirt-dev/queue var/log/invirt/builds usr/share/invirt-dev/build.d diff --git a/debian/invirt-dev.init b/debian/invirt-dev.init index a5bc89a..1af115e 100755 --- a/debian/invirt-dev.init +++ b/debian/invirt-dev.init @@ -29,13 +29,23 @@ do_start() gen_files || ret=2 reprepro-env export || ret=2 invirt-build-conf || ret=2 + daemon -n invirt-dev-git-daemon -- git daemon \ + --user=git \ + --group=nogroup \ + --syslog \ + --verbose \ + --reuseaddr \ + --export-all \ + --base-path=/srv/git \ + /srv/git || ret=$? return $ret } do_stop() { - : + daemon -n invirt-dev-git-daemon --stop + return $? } do_reload() diff --git a/debian/invirt-dev.upstart b/debian/invirt-dev.upstart deleted file mode 100644 index 96eddb3..0000000 --- a/debian/invirt-dev.upstart +++ /dev/null @@ -1,12 +0,0 @@ -start on startup -stop on shutdown - -exec /usr/bin/git \ - daemon \ - --user=git --group=nogroup \ - --verbose \ - --reuseaddr \ - --export-all - --base-path=/srv/git \ - /srv/git -respawn diff --git a/debian/rules b/debian/rules index d35722d..ef4b266 100755 --- a/debian/rules +++ b/debian/rules @@ -5,8 +5,5 @@ DEB_PYTHON_SYSTEM=pysupport include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/python-distutils.mk -install/invirt-dev:: - cp debian/invirt-dev.upstart debian/invirt-dev/etc/event.d/invirt-dev - clean:: rm -rf python/invirt.builder.egg-info -- 1.7.9.5