diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2007-02-23 11:09:41 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2007-02-23 11:09:41 +0000 |
| commit | 0f03b04cabf1665fafa7cafb061c28ef9b4ad9f8 (patch) | |
| tree | a70eb869cfd1bb532ab44597c7a929db67e0e855 /net-dns | |
| parent | Update Manifest with missing hashes. (diff) | |
| download | gentoo-2-0f03b04cabf1665fafa7cafb061c28ef9b4ad9f8.tar.gz gentoo-2-0f03b04cabf1665fafa7cafb061c28ef9b4ad9f8.tar.bz2 gentoo-2-0f03b04cabf1665fafa7cafb061c28ef9b4ad9f8.zip | |
Use start-stop-daemon better.
(Portage version: 2.1.2-r10)
Diffstat (limited to 'net-dns')
| -rw-r--r-- | net-dns/dnsmasq/ChangeLog | 5 | ||||
| -rw-r--r-- | net-dns/dnsmasq/files/dnsmasq-init | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog index 12686fc79bdc..4f819931a623 100644 --- a/net-dns/dnsmasq/ChangeLog +++ b/net-dns/dnsmasq/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-dns/dnsmasq # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.113 2007/02/20 12:38:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.114 2007/02/23 11:09:41 uberlord Exp $ + + 23 Feb 2007; Roy Marples <uberlord@gentoo.org> files/dnsmasq-init: + Use start-stop-daemon better. 20 Feb 2007; Raúl Porcel <armin76@gentoo.org> dnsmasq-2.34.ebuild: x86 stable diff --git a/net-dns/dnsmasq/files/dnsmasq-init b/net-dns/dnsmasq/files/dnsmasq-init index c468537f8782..e25d45fe21ab 100644 --- a/net-dns/dnsmasq/files/dnsmasq-init +++ b/net-dns/dnsmasq/files/dnsmasq-init @@ -1,9 +1,9 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init,v 1.8 2006/01/09 12:21:39 avenj Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init,v 1.9 2007/02/23 11:09:41 uberlord Exp $ -opts="${opts} reload" +opts="reload" depend() { provide dns @@ -12,18 +12,22 @@ depend() { start() { ebegin "Starting dnsmasq" - /usr/sbin/dnsmasq -x /var/run/dnsmasq.pid ${DNSMASQ_OPTS} + start-stop-daemon --start --exec /usr/sbin/dnsmasq \ + -- pidfile /var/run/dnsmasq.pid \ + -- -x /var/run/dnsmasq.pid ${DNSMASQ_OPTS} eend $? } stop() { ebegin "Stopping dnsmasq" - start-stop-daemon --stop --quiet --pidfile /var/run/dnsmasq.pid + start-stop-daemon --stop --exec /usr/sbin/dnsmasq \ + --pidfile /var/run/dnsmasq.pid eend $? } reload() { ebegin "Reloading dnsmasq" - kill -HUP $(< /var/run/dnsmasq.pid) + start-stop-daemon --stop --oknodo --signal HUP \ + --exec /usr/sbin/dnsmasq --pidfile /var/run/dnsmasq.pid eend $? } |