Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/ntp/files: ntp-client.confd ntp-client.rc
Date: Tue, 24 Dec 2013 11:01:57
Message-Id: 20131224110153.208A72004E@flycatcher.gentoo.org
1 vapier 13/12/24 11:01:53
2
3 Modified: ntp-client.confd ntp-client.rc
4 Log:
5 Default to using dns since we default to using hostnames #473222 by Xavier Miller.
6
7 Revision Changes Path
8 1.14 net-misc/ntp/files/ntp-client.confd
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ntp/files/ntp-client.confd?rev=1.14&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ntp/files/ntp-client.confd?rev=1.14&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ntp/files/ntp-client.confd?r1=1.13&r2=1.14
13
14 Index: ntp-client.confd
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.confd,v
17 retrieving revision 1.13
18 retrieving revision 1.14
19 diff -u -r1.13 -r1.14
20 --- ntp-client.confd 21 Sep 2008 05:19:24 -0000 1.13
21 +++ ntp-client.confd 24 Dec 2013 11:01:52 -0000 1.14
22 @@ -14,3 +14,8 @@
23 NTPCLIENT_OPTS="-s -b -u \
24 0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org \
25 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
26 +
27 +# If you use hostnames above, then you should depend on dns
28 +# being up & running before we try to run. Otherwise, you
29 +# can disable this.
30 +rc_use="dns"
31
32
33
34 1.13 net-misc/ntp/files/ntp-client.rc
35
36 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ntp/files/ntp-client.rc?rev=1.13&view=markup
37 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ntp/files/ntp-client.rc?rev=1.13&content-type=text/plain
38 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ntp/files/ntp-client.rc?r1=1.12&r2=1.13
39
40 Index: ntp-client.rc
41 ===================================================================
42 RCS file: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v
43 retrieving revision 1.12
44 retrieving revision 1.13
45 diff -u -r1.12 -r1.13
46 --- ntp-client.rc 11 Nov 2012 05:58:25 -0000 1.12
47 +++ ntp-client.rc 24 Dec 2013 11:01:52 -0000 1.13
48 @@ -1,7 +1,7 @@
49 #!/sbin/runscript
50 -# Copyright 1999-2012 Gentoo Foundation
51 +# Copyright 1999-2013 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.12 2012/11/11 05:58:25 vapier Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.13 2013/12/24 11:01:52 vapier Exp $
55
56 depend() {
57 before cron portmap
58 @@ -10,7 +10,7 @@
59 }
60
61 checkconfig() {
62 - if ! type "${NTPCLIENT_CMD}" >/dev/null 2>/dev/null ; then
63 + if ! type "${NTPCLIENT_CMD}" >/dev/null 2>&1 ; then
64 eerror "Please edit /etc/conf.d/ntp-client"
65 eerror "Unable to locate the client command ${NTPCLIENT_CMD}!"
66 return 1