diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-12-24 11:01:52 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-12-24 11:01:52 +0000 |
| commit | 490efa525941818759ff16970b413bab20ad1b73 (patch) | |
| tree | a7888294c5993d007ce2a67e819fab83703927ac /net-misc | |
| parent | add --disable-systemd-updates, bug #495206 (diff) | |
| download | gentoo-2-490efa525941818759ff16970b413bab20ad1b73.tar.gz gentoo-2-490efa525941818759ff16970b413bab20ad1b73.tar.bz2 gentoo-2-490efa525941818759ff16970b413bab20ad1b73.zip | |
Default to using dns since we default to using hostnames #473222 by Xavier Miller.
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/ntp/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntp-client.confd | 5 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntp-client.rc | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog index a6426d4f1bc7..4e6abc080cdd 100644 --- a/net-misc/ntp/ChangeLog +++ b/net-misc/ntp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/ntp # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.201 2013/12/17 13:44:25 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.202 2013/12/24 11:01:52 vapier Exp $ + + 24 Dec 2013; Mike Frysinger <vapier@gentoo.org> files/ntp-client.confd, + files/ntp-client.rc: + Default to using dns since we default to using hostnames #473222 by Xavier + Miller. 17 Dec 2013; Raúl Porcel <armin76@gentoo.org> ntp-4.2.6_p5-r7.ebuild: ia64/s390/sh/sparc stable wrt #480084 diff --git a/net-misc/ntp/files/ntp-client.confd b/net-misc/ntp/files/ntp-client.confd index e85502c7a4f7..786004da83b7 100644 --- a/net-misc/ntp/files/ntp-client.confd +++ b/net-misc/ntp/files/ntp-client.confd @@ -14,3 +14,8 @@ NTPCLIENT_CMD="ntpdate" NTPCLIENT_OPTS="-s -b -u \ 0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org \ 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" + +# If you use hostnames above, then you should depend on dns +# being up & running before we try to run. Otherwise, you +# can disable this. +rc_use="dns" diff --git a/net-misc/ntp/files/ntp-client.rc b/net-misc/ntp/files/ntp-client.rc index a50a6ef43a25..3a8b15e80483 100644 --- a/net-misc/ntp/files/ntp-client.rc +++ b/net-misc/ntp/files/ntp-client.rc @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.12 2012/11/11 05:58:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.13 2013/12/24 11:01:52 vapier Exp $ depend() { before cron portmap @@ -10,7 +10,7 @@ depend() { } checkconfig() { - if ! type "${NTPCLIENT_CMD}" >/dev/null 2>/dev/null ; then + if ! type "${NTPCLIENT_CMD}" >/dev/null 2>&1 ; then eerror "Please edit /etc/conf.d/ntp-client" eerror "Unable to locate the client command ${NTPCLIENT_CMD}!" return 1 |