Your message dated Thu, 5 Mar 2009 15:46:24 +0000
with message-id
<20090305154624.28550.qm...@a0a5b07a0dfc83.315fe32.mid.smarden.org>
and subject line Re: Bug#491494: dnscache-run: Uses /etc/sv/ instead of
/etc/service
has caused the Debian Bug report #491494,
regarding dnscache-run: Uses /etc/sv/ instead of /etc/service
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
491494: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491494
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dnscache-run
Version: 1:1.05-3
Prioirity: important
Tags: patch
Dnscache-run uses /etc/sv/ to setup the dnscache service instead of
/etc/service, which is the directory created by the 'daemontools-run'
package. The attached (untested) patch fixes the package so it uses the
/etc/service directory to create the service it configures.
This should fix some of the issues reported in #491343.
Regards
Javier
diff -Nru djbdns-1.05.old/debian/dnscache-run.conffiles djbdns-1.05/debian/dnscache-run.conffiles
--- djbdns-1.05.old/debian/dnscache-run.conffiles 2008-07-19 23:30:00.000000000 +0200
+++ djbdns-1.05/debian/dnscache-run.conffiles 2008-07-19 23:36:46.000000000 +0200
@@ -1,10 +1,10 @@
-/etc/sv/dnscache/env/CACHESIZE
-/etc/sv/dnscache/env/DATALIMIT
-/etc/sv/dnscache/env/IP
-/etc/sv/dnscache/env/IPSEND
-/etc/sv/dnscache/env/ROOT
-/etc/sv/dnscache/log/run
-/etc/sv/dnscache/log/status
-/etc/sv/dnscache/root/ip/127.0.0.1
-/etc/sv/dnscache/root/servers/@
-/etc/sv/dnscache/run
+/etc/service/dnscache/env/CACHESIZE
+/etc/service/dnscache/env/DATALIMIT
+/etc/service/dnscache/env/IP
+/etc/service/dnscache/env/IPSEND
+/etc/service/dnscache/env/ROOT
+/etc/service/dnscache/log/run
+/etc/service/dnscache/log/status
+/etc/service/dnscache/root/ip/127.0.0.1
+/etc/service/dnscache/root/servers/@
+/etc/service/dnscache/run
diff -Nru djbdns-1.05.old/debian/dnscache-run.postinst djbdns-1.05/debian/dnscache-run.postinst
--- djbdns-1.05.old/debian/dnscache-run.postinst 2008-07-19 23:30:00.000000000 +0200
+++ djbdns-1.05/debian/dnscache-run.postinst 2008-07-19 23:37:32.000000000 +0200
@@ -2,7 +2,7 @@
set -e
test "$1" = 'configure' || exit 0
-update-service --add /etc/sv/dnscache
+update-service --add /etc/service/dnscache
test -z "$2" || exit 0
chown Gdnslog:adm /var/log/dnscache
diff -Nru djbdns-1.05.old/debian/dnscache-run.postrm djbdns-1.05/debian/dnscache-run.postrm
--- djbdns-1.05.old/debian/dnscache-run.postrm 2008-07-19 23:34:42.000000000 +0200
+++ djbdns-1.05/debian/dnscache-run.postrm 2008-07-19 23:36:54.000000000 +0200
@@ -3,8 +3,8 @@
test "$1" = 'purge' || exit 0
-svc -x /etc/sv/dnscache || :
-rm -rf /etc/sv/dnscache
+svc -x /etc/service/dnscache || :
+rm -rf /etc/service/dnscache
rm -rf /var/lib/supervise/dnscache /var/lib/supervise/dnscache.log
for i in '@*' current config lock state; do
rm -f /var/log/dnscache/$i
diff -Nru djbdns-1.05.old/debian/dnscache-run.preinst djbdns-1.05/debian/dnscache-run.preinst
--- djbdns-1.05.old/debian/dnscache-run.preinst 2008-07-19 23:30:00.000000000 +0200
+++ djbdns-1.05/debian/dnscache-run.preinst 2008-07-19 23:38:02.000000000 +0200
@@ -11,5 +11,5 @@
--home /nonexistent --no-create-home $i || exit 1;
done
-dnscache-conf Gdnscache Gdnslog /etc/sv/dnscache
-rmdir /etc/sv/dnscache/log/main
+dnscache-conf Gdnscache Gdnslog /etc/service/dnscache
+[ -d /etc/service/dnscache/log/main] && rmdir /etc/service/dnscache/log/main
diff -Nru djbdns-1.05.old/debian/dnscache-run.prerm djbdns-1.05/debian/dnscache-run.prerm
--- djbdns-1.05.old/debian/dnscache-run.prerm 2008-07-19 23:30:00.000000000 +0200
+++ djbdns-1.05/debian/dnscache-run.prerm 2008-07-19 23:38:20.000000000 +0200
@@ -4,4 +4,4 @@
test "$1" = 'remove' || test "$1" = 'deconfigure' ||
test "$1" = 'failed-upgrade' || exit 0
-update-service --remove /etc/sv/dnscache || :
+update-service --remove /etc/service/dnscache || :
diff -Nru djbdns-1.05.old/debian/rules djbdns-1.05/debian/rules
--- djbdns-1.05.old/debian/rules 2008-07-19 23:30:00.000000000 +0200
+++ djbdns-1.05/debian/rules 2008-07-19 23:38:35.000000000 +0200
@@ -111,9 +111,9 @@
install-indep: deb-checkdir deb-checkuid
rm -rf '$(DIRCACHERUN)'
$(MAKE) -Cdnscache-run install DESTDIR='$(DIRCACHERUN)'
- ln -s sv/dnscache '$(DIRCACHERUN)'/etc/dnscache
+ ln -s service/dnscache '$(DIRCACHERUN)'/etc/dnscache
install -d -m0755 '$(DIRCACHERUN)'/var/log/dnscache
- ln -s /var/log/dnscache '$(DIRCACHERUN)'/etc/sv/dnscache/log/main
+ ln -s /var/log/dnscache '$(DIRCACHERUN)'/etc/service/dnscache/log/main
binary: binary-indep binary-arch
binary-arch: install-arch djbdns.deb dbndns.deb
diff -Nru djbdns-1.05.old/dnscache-run/env/ROOT djbdns-1.05/dnscache-run/env/ROOT
--- djbdns-1.05.old/dnscache-run/env/ROOT 2008-07-19 23:30:00.000000000 +0200
+++ djbdns-1.05/dnscache-run/env/ROOT 2008-07-19 23:39:00.000000000 +0200
@@ -1 +1 @@
-/etc/sv/dnscache/root
+/etc/service/dnscache/root
diff -Nru djbdns-1.05.old/dnscache-run/Makefile djbdns-1.05/dnscache-run/Makefile
--- djbdns-1.05.old/dnscache-run/Makefile 2008-07-19 23:30:00.000000000 +0200
+++ djbdns-1.05/dnscache-run/Makefile 2008-07-19 23:39:17.000000000 +0200
@@ -1,15 +1,15 @@
install:
- install -d -m3755 '$(DESTDIR)'/etc/sv/dnscache
- install -d -m2755 '$(DESTDIR)'/etc/sv/dnscache/env
- install -d -m2755 '$(DESTDIR)'/etc/sv/dnscache/log
- install -d -m2755 '$(DESTDIR)'/etc/sv/dnscache/root
- install -m0755 run '$(DESTDIR)'/etc/sv/dnscache/
- install -m0644 env/* '$(DESTDIR)'/etc/sv/dnscache/env/
- install -m0755 log/run '$(DESTDIR)'/etc/sv/dnscache/log/
- touch '$(DESTDIR)'/etc/sv/dnscache/log/status
- chmod 0644 '$(DESTDIR)'/etc/sv/dnscache/log/status
- install -d -m2755 '$(DESTDIR)'/etc/sv/dnscache/root/ip
- install -d -m2755 '$(DESTDIR)'/etc/sv/dnscache/root/servers
- touch '$(DESTDIR)'/etc/sv/dnscache/root/ip/127.0.0.1
- chmod 0600 '$(DESTDIR)'/etc/sv/dnscache/root/ip/127.0.0.1
- install -m0644 root/servers/@ '$(DESTDIR)'/etc/sv/dnscache/root/servers/
+ install -d -m3755 '$(DESTDIR)'/etc/service/dnscache
+ install -d -m2755 '$(DESTDIR)'/etc/service/dnscache/env
+ install -d -m2755 '$(DESTDIR)'/etc/service/dnscache/log
+ install -d -m2755 '$(DESTDIR)'/etc/service/dnscache/root
+ install -m0755 run '$(DESTDIR)'/etc/service/dnscache/
+ install -m0644 env/* '$(DESTDIR)'/etc/service/dnscache/env/
+ install -m0755 log/run '$(DESTDIR)'/etc/service/dnscache/log/
+ touch '$(DESTDIR)'/etc/service/dnscache/log/status
+ chmod 0644 '$(DESTDIR)'/etc/service/dnscache/log/status
+ install -d -m2755 '$(DESTDIR)'/etc/service/dnscache/root/ip
+ install -d -m2755 '$(DESTDIR)'/etc/service/dnscache/root/servers
+ touch '$(DESTDIR)'/etc/service/dnscache/root/ip/127.0.0.1
+ chmod 0600 '$(DESTDIR)'/etc/service/dnscache/root/ip/127.0.0.1
+ install -m0644 root/servers/@ '$(DESTDIR)'/etc/service/dnscache/root/servers/
--- End Message ---
--- Begin Message ---
On Sat, Jul 19, 2008 at 11:44:31PM +0200, Javier Fernández-Sanguino Peña wrote:
> Dnscache-run uses /etc/sv/ to setup the dnscache service instead of
> /etc/service, which is the directory created by the 'daemontools-run'
> package.
Hi, this is how it should be. The service directory is located in
/etc/sv/, and to activate the service a symlink is created in
/etc/service/.
Regards, Gerrit.
--- End Message ---
