diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-08-20 04:10:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-08-20 04:10:15 +0000 |
| commit | 4d5ddd6114834a470ae8428cf651e4959487abf1 (patch) | |
| tree | 2e8736d29c895a6b92fdb6c514092ca4abed37bb /net-misc/ntp | |
| parent | Add support for USE=fontconfig #79375 by Jung Tae-young. (diff) | |
| download | gentoo-2-4d5ddd6114834a470ae8428cf651e4959487abf1.tar.gz gentoo-2-4d5ddd6114834a470ae8428cf651e4959487abf1.tar.bz2 gentoo-2-4d5ddd6114834a470ae8428cf651e4959487abf1.zip | |
Pass --exec to ssd when stopping so we kill the right process #82859 by Peter Wendrich.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'net-misc/ntp')
| -rw-r--r-- | net-misc/ntp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntpd.rc | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog index d90f0cda559f..1c25c6b65b85 100644 --- a/net-misc/ntp/ChangeLog +++ b/net-misc/ntp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/ntp # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.66 2005/08/16 03:24:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.67 2005/08/20 04:10:15 vapier Exp $ + + 20 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/ntpd.rc: + Pass --exec to ssd when stopping so we kill the right process #82859 by + Peter Wendrich. 16 Aug 2005; Mike Frysinger <vapier@gentoo.org> +files/ntp-4.2.0.20050303-rlimit-memlock.patch, ntp-4.2.0.20050303.ebuild: diff --git a/net-misc/ntp/files/ntpd.rc b/net-misc/ntp/files/ntpd.rc index fc1c3b9f8dcf..73459474c788 100644 --- a/net-misc/ntp/files/ntpd.rc +++ b/net-misc/ntp/files/ntpd.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.21 2004/10/28 21:53:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.22 2005/08/20 04:10:15 vapier Exp $ depend() { need net @@ -22,13 +22,17 @@ start() { checkconfig || return $? ebegin "Starting ntpd" - /usr/bin/ntpd -p /var/run/ntpd.pid ${NTPD_OPTS} + /usr/sbin/ntpd -p /var/run/ntpd.pid ${NTPD_OPTS} eend $? "Failed to start ntpd" } stop() { ebegin "Stopping ntpd" - start-stop-daemon --stop --pidfile /var/run/ntpd.pid - eend $? "Failed to stop ntpd" + start-stop-daemon --stop \ + --pidfile /var/run/ntpd.pid \ + --exec /usr/sbin/ntpd + local ret=$? + eend ${ret} "Failed to stop ntpd" rm -f /var/run/ntpd.pid + return ${ret} } |