diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-12-27 23:47:44 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-12-27 23:47:44 +0000 |
| commit | 38141c4bae55a95fc4817680062a09f4e1c1a43d (patch) | |
| tree | 362f3dc6bbbe8fe448d554b3c5d9ec37a5de9a66 /net-misc/ntp/files/ntpd.rc | |
| parent | Unmasked due to glsa (diff) | |
| download | gentoo-2-38141c4bae55a95fc4817680062a09f4e1c1a43d.tar.gz gentoo-2-38141c4bae55a95fc4817680062a09f4e1c1a43d.tar.bz2 gentoo-2-38141c4bae55a95fc4817680062a09f4e1c1a43d.zip | |
fix bug #897 again
Diffstat (limited to 'net-misc/ntp/files/ntpd.rc')
| -rw-r--r-- | net-misc/ntp/files/ntpd.rc | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/net-misc/ntp/files/ntpd.rc b/net-misc/ntp/files/ntpd.rc index 09f3729300c3..d2a68dccd33f 100644 --- a/net-misc/ntp/files/ntpd.rc +++ b/net-misc/ntp/files/ntpd.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.6 2002/12/23 17:12:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.7 2002/12/27 23:47:44 azarah Exp $ depend() { need net @@ -19,19 +19,25 @@ checkconfig() { start() { checkconfig || return $? - NTPDATESERVERS=`egrep '^(server|peer)[[:space:]]+' /etc/ntp.conf | awk '{print $2}'` - if [ -n "${NTPDATESERVERS}" ] ; then - ebegin "Running ntpdate" - ntpdate -b ${NTPDATESERVERS} > /dev/null - eend $? "Failed to run ntpdate" - else + NTPDATESERVERS="`egrep '^(server|peer)[[:space:]]+' /etc/ntp.conf`" + if [ -z "${NTPDATESERVERS}" ] ; then ewarn "Please set a valid server line in /etc/ntp.conf" fi - ebegin "Starting ntpd" + if [ "${NTPD_OPTS/-q}" != "${NTPD_OPTS}" ] ; then + ebegin "Starting ntpd (ntpdate)" + start-stop-daemon --start --quiet --pidfile /var/run/ntpd.pid \ + --startas /usr/bin/ntpd -- -p /var/run/ntpd.pid ${NTPD_OPTS} + eend $? "Failed to start ntpd (ntpdate)" + + # clean stale pidfile + [ -f /var/run/ntpd.pid ] && rm -f /var/run/ntpd.pid + fi + + ebegin "Starting ntpd (daemon)" start-stop-daemon --start --quiet --pidfile /var/run/ntpd.pid \ - --startas /usr/bin/ntpd -- -p /var/run/ntpd.pid - eend $? "Failed to start ntpd" + --startas /usr/bin/ntpd -- -p /var/run/ntpd.pid ${NTPD_OPTS/-q} + eend $? "Failed to start ntpd (daemon)" } stop() { |