head	1.20;
access;
symbols
	RELENG_8_4:1.19.0.2
	RELENG_9_1_0_RELEASE:1.17.2.2.2.2
	RELENG_9_1:1.17.2.2.0.2
	RELENG_9_1_BP:1.17.2.2
	RELENG_8_3_0_RELEASE:1.16.10.3.2.1
	RELENG_8_3:1.16.10.3.0.2
	RELENG_8_3_BP:1.16.10.3
	RELENG_9_0_0_RELEASE:1.17.2.1.2.1
	RELENG_9_0:1.17.2.1.0.2
	RELENG_9_0_BP:1.17.2.1
	RELENG_9:1.17.0.2
	RELENG_9_BP:1.17
	RELENG_7_4_0_RELEASE:1.16.14.1
	RELENG_8_2_0_RELEASE:1.16.10.2.4.1
	RELENG_7_4:1.16.0.14
	RELENG_7_4_BP:1.16
	RELENG_8_2:1.16.10.2.0.4
	RELENG_8_2_BP:1.16.10.2
	RELENG_8_1_0_RELEASE:1.16.10.2.2.1
	RELENG_8_1:1.16.10.2.0.2
	RELENG_8_1_BP:1.16.10.2
	RELENG_7_3_0_RELEASE:1.16.12.1
	RELENG_7_3:1.16.0.12
	RELENG_7_3_BP:1.16
	RELENG_8_0_0_RELEASE:1.16.10.1.2.1
	RELENG_8_0:1.16.10.1.0.2
	RELENG_8_0_BP:1.16.10.1
	RELENG_8:1.16.0.10
	RELENG_8_BP:1.16
	RELENG_7_2_0_RELEASE:1.16.8.1
	RELENG_7_2:1.16.0.8
	RELENG_7_2_BP:1.16
	RELENG_7_1_0_RELEASE:1.16.6.1
	RELENG_6_4_0_RELEASE:1.13.2.2.6.1
	RELENG_7_1:1.16.0.6
	RELENG_7_1_BP:1.16
	RELENG_6_4:1.13.2.2.0.6
	RELENG_6_4_BP:1.13.2.2
	RELENG_7_0_0_RELEASE:1.16
	RELENG_6_3_0_RELEASE:1.13.2.2
	RELENG_7_0:1.16.0.4
	RELENG_7_0_BP:1.16
	RELENG_6_3:1.13.2.2.0.4
	RELENG_6_3_BP:1.13.2.2
	RELENG_7:1.16.0.2
	RELENG_7_BP:1.16
	RELENG_6_2_0_RELEASE:1.13.2.2
	RELENG_6_2:1.13.2.2.0.2
	RELENG_6_2_BP:1.13.2.2
	RELENG_5_5_0_RELEASE:1.9.2.2
	RELENG_5_5:1.9.2.2.0.4
	RELENG_5_5_BP:1.9.2.2
	RELENG_6_1_0_RELEASE:1.13.2.1
	RELENG_6_1:1.13.2.1.0.2
	RELENG_6_1_BP:1.13.2.1
	RELENG_6_0_0_RELEASE:1.13
	RELENG_6_0:1.13.0.4
	RELENG_6_0_BP:1.13
	RELENG_6:1.13.0.2
	RELENG_6_BP:1.13
	RELENG_5_4_0_RELEASE:1.9.2.2
	RELENG_5_4:1.9.2.2.0.2
	RELENG_5_4_BP:1.9.2.2
	RELENG_5_3_0_RELEASE:1.9.2.1
	RELENG_5_3:1.9.2.1.0.2
	RELENG_5_3_BP:1.9.2.1
	RELENG_5:1.9.0.2
	RELENG_5_BP:1.9
	RELENG_5_2_1_RELEASE:1.4
	RELENG_5_2_0_RELEASE:1.4
	RELENG_5_2:1.4.0.6
	RELENG_5_2_BP:1.4
	RELENG_5_1_0_RELEASE:1.4
	RELENG_5_1:1.4.0.4
	RELENG_5_1_BP:1.4
	RELENG_5_0_0_RELEASE:1.4
	RELENG_5_0:1.4.0.2
	RELENG_5_0_BP:1.4
	head_20020621:1.1.1.2
	head_20010615:1.1.1.1
	NETBSD:1.1.1;
locks; strict;
comment	@# @;


1.20
date	2013.06.19.00.26.31;	author svnexp;	state Exp;
branches;
next	1.19;

1.19
date	2012.11.17.01.49.05;	author svnexp;	state Exp;
branches
	1.19.2.1;
next	1.18;

1.18
date	2012.01.14.02.18.41;	author dougb;	state Exp;
branches;
next	1.17;

1.17
date	2010.01.30.16.34.52;	author ume;	state Exp;
branches
	1.17.2.1;
next	1.16;

1.16
date	2006.07.20.10.07.34;	author flz;	state Exp;
branches
	1.16.2.1
	1.16.6.1
	1.16.8.1
	1.16.10.1
	1.16.12.1
	1.16.14.1;
next	1.15;

1.15
date	2006.01.16.06.03.42;	author dougb;	state Exp;
branches;
next	1.14;

1.14
date	2005.12.21.09.48.41;	author dougb;	state Exp;
branches;
next	1.13;

1.13
date	2005.01.17.18.28.09;	author ceri;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	2004.10.07.13.55.26;	author mtm;	state Exp;
branches;
next	1.11;

1.11
date	2004.09.15.01.08.33;	author seanc;	state Exp;
branches;
next	1.10;

1.10
date	2004.09.14.03.04.50;	author seanc;	state dead;
branches;
next	1.9;

1.9
date	2004.03.29.20.00.54;	author des;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	2004.03.22.16.35.35;	author des;	state Exp;
branches;
next	1.7;

1.7
date	2004.03.08.12.25.05;	author pjd;	state Exp;
branches;
next	1.6;

1.6
date	2004.01.17.10.59.43;	author mtm;	state Exp;
branches;
next	1.5;

1.5
date	2004.01.17.10.16.38;	author mtm;	state Exp;
branches;
next	1.4;

1.4
date	2002.10.12.10.31.31;	author schweikh;	state Exp;
branches;
next	1.3;

1.3
date	2002.09.06.16.18.05;	author gordon;	state Exp;
branches;
next	1.2;

1.2
date	2002.06.13.22.14.36;	author gordon;	state Exp;
branches;
next	1.1;

1.1
date	2001.06.16.07.16.14;	author obrien;	state Exp;
branches
	1.1.1.1;
next	;

1.19.2.1
date	2012.11.17.01.49.05;	author svnexp;	state dead;
branches;
next	1.19.2.2;

1.19.2.2
date	2013.03.28.13.02.44;	author svnexp;	state Exp;
branches;
next	;

1.17.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.17.2.1.2.1;
next	1.17.2.2;

1.17.2.2
date	2012.02.14.10.16.56;	author dougb;	state Exp;
branches
	1.17.2.2.2.1;
next	1.17.2.3;

1.17.2.3
date	2012.11.17.11.36.11;	author svnexp;	state Exp;
branches;
next	;

1.17.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.17.2.1.2.2;

1.17.2.1.2.2
date	2012.11.17.08.36.11;	author svnexp;	state Exp;
branches;
next	;

1.17.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.17.2.2.2.2;

1.17.2.2.2.2
date	2012.11.17.08.47.01;	author svnexp;	state Exp;
branches;
next	;

1.16.2.1
date	2012.02.14.10.17.30;	author dougb;	state Exp;
branches;
next	1.16.2.2;

1.16.2.2
date	2012.11.17.08.01.22;	author svnexp;	state Exp;
branches;
next	;

1.16.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.16.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.16.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.16.10.1.2.1;
next	1.16.10.2;

1.16.10.2
date	2010.02.06.15.32.42;	author ume;	state Exp;
branches
	1.16.10.2.2.1
	1.16.10.2.4.1;
next	1.16.10.3;

1.16.10.3
date	2012.02.14.10.17.14;	author dougb;	state Exp;
branches
	1.16.10.3.2.1;
next	1.16.10.4;

1.16.10.4
date	2012.11.17.10.35.57;	author svnexp;	state Exp;
branches;
next	;

1.16.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.16.10.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.16.10.2.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.16.10.3.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.16.10.3.2.2;

1.16.10.3.2.2
date	2012.11.17.08.24.38;	author svnexp;	state Exp;
branches;
next	;

1.16.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.16.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.16.14.2;

1.16.14.2
date	2012.11.17.08.16.37;	author svnexp;	state Exp;
branches;
next	;

1.13.2.1
date	2006.01.17.06.45.05;	author dougb;	state Exp;
branches;
next	1.13.2.2;

1.13.2.2
date	2006.08.02.18.44.12;	author flz;	state Exp;
branches
	1.13.2.2.6.1;
next	1.13.2.3;

1.13.2.3
date	2012.11.17.07.39.08;	author svnexp;	state Exp;
branches;
next	;

1.13.2.2.6.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.9.2.1
date	2004.10.10.09.50.54;	author mtm;	state Exp;
branches;
next	1.9.2.2;

1.9.2.2
date	2005.01.30.13.23.44;	author ceri;	state Exp;
branches;
next	;

1.1.1.1
date	2001.06.16.07.16.14;	author obrien;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2002.06.21.19.07.21;	author obrien;	state Exp;
branches;
next	;


desc
@@


1.20
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251885
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@#!/bin/sh
#
# $FreeBSD: head/etc/rc.d/ntpdate 251885 2013-06-18 02:37:15Z dteske $
#

# PROVIDE: ntpdate
# REQUIRE: NETWORKING syslogd named
# KEYWORD: nojail

. /etc/rc.subr

name="ntpdate"
rcvar="ntpdate_enable"
stop_cmd=":"
start_cmd="ntpdate_start"

ntpdate_start()
{
	if [ -z "$ntpdate_hosts" -a -f "$ntpdate_config" ]; then
		ntpdate_hosts=`awk '
			/^server[ \t]*127.127/      {next}
			/^(server|peer)/            {
			    if ($2 ~/^-/)           {print $3}
			    else                    {print $2}}
		' < "$ntpdate_config"`
	fi
	if [ -n "$ntpdate_hosts" -o -n "$rc_flags" ]; then
		echo "Setting date via ntp."
		${ntpdate_program:-ntpdate} $rc_flags $ntpdate_hosts
	fi
}

load_rc_config $name
run_rc_command "$1"
@


1.19
log
@Switching exporter and resync
@
text
@d3 1
a3 1
# $FreeBSD: head/etc/rc.d/ntpdate 230099 2012-01-14 02:18:41Z dougb $
d19 1
a19 1
	if [ -z "$ntpdate_hosts" -a -f ${ntpdate_config} ]; then
d25 1
a25 1
		' < ${ntpdate_config}`
@


1.19.2.1
log
@file ntpdate was added on branch RELENG_8_4 on 2013-03-28 13:02:44 +0000
@
text
@d1 34
@


1.19.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 34
#!/bin/sh
#
# $FreeBSD: releng/8.4/etc/rc.d/ntpdate 231655 2012-02-14 10:17:14Z dougb $
#

# PROVIDE: ntpdate
# REQUIRE: NETWORKING syslogd named
# KEYWORD: nojail

. /etc/rc.subr

name="ntpdate"
rcvar="ntpdate_enable"
stop_cmd=":"
start_cmd="ntpdate_start"

ntpdate_start()
{
	if [ -z "$ntpdate_hosts" -a -f ${ntpdate_config} ]; then
		ntpdate_hosts=`awk '
			/^server[ \t]*127.127/      {next}
			/^(server|peer)/            {
			    if ($2 ~/^-/)           {print $3}
			    else                    {print $2}}
		' < ${ntpdate_config}`
	fi
	if [ -n "$ntpdate_hosts" -o -n "$rc_flags" ]; then
		echo "Setting date via ntp."
		${ntpdate_program:-ntpdate} $rc_flags $ntpdate_hosts
	fi
}

load_rc_config $name
run_rc_command "$1"
@


1.18
log
@SVN rev 230099 on 2012-01-14 02:18:41Z by dougb

Prepare for the removal of set_rcvar() by changing the rcvar=
assignments to the literal values it would have returned.

The concept of set_rcvar() was nice in theory, but the forks
it creates are a drag on the startup process, which is especially
noticeable on slower systems, such as embedded ones.

During the discussion on freebsd-rc@@ a preference was expressed for
using ${name}_enable instead of the literal values. However the
code portability concept doesn't really apply since there are so
many other places where the literal name has to be searched for
and replaced. Also, using the literal value is also a tiny bit
faster than dereferencing the variables, and every little bit helps.
@
text
@d3 1
a3 1
# $FreeBSD$
@


1.17
log
@SVN rev 203200 on 2010-01-30 16:34:52Z by ume

Allow use of -6 option to "server" and "peer" in ntp.conf.

MFC after:	1 week
@
text
@d13 1
a13 1
rcvar=`set_rcvar`
@


1.17.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.17.2.2
log
@SVN rev 231653 on 2012-02-14 10:16:56Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@d13 1
a13 1
rcvar="ntpdate_enable"
@


1.17.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d3 1
a3 1
# $FreeBSD: stable/9/etc/rc.d/ntpdate 231653 2012-02-14 10:16:56Z dougb $
@


1.17.2.2.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.17.2.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.1/etc/rc.d/ntpdate 231653 2012-02-14 10:16:56Z dougb $
@


1.17.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.17.2.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/ntpdate 203200 2010-01-30 16:34:52Z ume $
@


1.16
log
@- Remove hardcoded /etc/ntp.conf configuration file from ntpdate rc.d script
and replace it with a new ntpdate_config variable.
- Document it in defaults/rc.conf and rc.conf.5.
- Document ntpdate_hosts in defaults/rc.conf.

Requested by:	Chris Timmons <cwt@@networks.cwu.edu>
Approved by:	cperciva (mentor, implicit)
MFC after:	1 week
@
text
@d22 3
a24 1
			/^(server|peer)/            {print $2}
@


1.16.2.1
log
@SVN rev 231656 on 2012-02-14 10:17:30Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@d13 1
a13 1
rcvar="ntpdate_enable"
@


1.16.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/7/etc/rc.d/ntpdate 231656 2012-02-14 10:17:30Z dougb $
@


1.16.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.16.14.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/ntpdate 160524 2006-07-20 10:07:34Z flz $
@


1.16.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.16.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.16.10.2
log
@SVN rev 203550 on 2010-02-06 15:32:42Z by ume

MFC r203200; Allow use of -6 option to "server" and "peer" in ntp.conf.
@
text
@d22 1
a22 3
			/^(server|peer)/            {
			    if ($2 ~/^-/)           {print $3}
			    else                    {print $2}}
@


1.16.10.3
log
@SVN rev 231655 on 2012-02-14 10:17:14Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@d13 1
a13 1
rcvar="ntpdate_enable"
@


1.16.10.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d3 1
a3 1
# $FreeBSD: stable/8/etc/rc.d/ntpdate 231655 2012-02-14 10:17:14Z dougb $
@


1.16.10.3.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.16.10.3.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/8.3/etc/rc.d/ntpdate 231655 2012-02-14 10:17:14Z dougb $
@


1.16.10.2.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.16.10.2.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.16.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.16.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.16.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.15
log
@REQUIRE named. On all systems I've examined running HEAD and
RELENG_6 this will be a noop, however as we introduce local
startup scripts to the base rcorder, we'll see more cases
where the previous status quo will need to be made explicit
to avoid having it disrupted when random local scripts are
added to the mix.
@
text
@d19 1
a19 1
	if [ -z "$ntpdate_hosts" -a -f /etc/ntp.conf ]; then
d23 1
a23 1
		' </etc/ntp.conf`
@


1.14
log
@Several users have commented (via filing PRs) that having ntp* depend
on devfs is useful so that a hardware time device can start with its
necessary device nodes already in place. While this ordering happens
as a side effect currently in HEAD, and the PRs were generally fixed
via upgrades, etc; it's better to make it explicit.

While I'm here, ntpd should REQUIRE ntpdate, rather than ntpdate
using BEFORE: ntpd.
@
text
@d7 1
a7 1
# REQUIRE: NETWORKING syslogd
@


1.13
log
@s/ntpdate_command/ntpdate_program/ to match rc.conf(5) and
/etc/defaults/rc.conf.

PR:		conf/76188
Submitted by:	Arne Wrner <arne_woerner at yahoo dot com>
Approved by:	murray
MFC After:	7 days
@
text
@a2 1
# $NetBSD: ntpdate,v 1.8 2002/03/22 04:16:39 lukem Exp $
a5 1
# BEFORE: ntpd
@


1.13.2.1
log
@MFC ntpd 1.12 and ntpdate 1.14 - use of REQUIRE rather than BEFORE,
MFC ntpd 1.12 - REQUIRE devfs to help users with serial GPS interfaces
MFC ntpdate 1.15 - REQUIRE named
@
text
@d3 1
d7 1
d9 1
a9 1
# REQUIRE: NETWORKING syslogd named
@


1.13.2.2
log
@MFC:

  - Remove hardcoded /etc/ntp.conf configuration file from ntpdate rc.d script
  and replace it with a new ntpdate_config variable.
  - Document it in defaults/rc.conf and rc.conf.5.
  - Document ntpdate_hosts in defaults/rc.conf.

      src/etc/rc.d/ntpdate: rev 1.15 -> 1.16
      src/share/man/man5/rc.conf.5: rev 1.299 -> 1.300
      src/etc/defaults/rc.conf: rev 1.288 -> 1.289

Requested by:	Chris Timmons <cwt@@networks.cwu.edu>
@
text
@d19 1
a19 1
	if [ -z "$ntpdate_hosts" -a -f ${ntpdate_config} ]; then
d23 1
a23 1
		' < ${ntpdate_config}`
@


1.13.2.3
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/ntpdate 160934 2006-08-02 18:44:12Z flz $
@


1.13.2.2.6.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.12
log
@Remove the requirement for the FreeBSD keyword as it no longer
makes any sense.

Discussed with: dougb, brooks
MFC after: 3 days
@
text
@d29 1
a29 1
		${ntpdate_command:-ntpdate} $rc_flags $ntpdate_hosts
@


1.11
log
@Bring back etc/rc.d/ntpdate as requested by scads of people.  This isn't a
complete backout as the ntpd_sync_on_start etc/rc.conf tunable is still
present, though the default is now NO (was YES).  Since we're no longer
syncing time at startup by default when ntpd is enabled (as was the case
24hrs ago), remove UPDATING entry pointing out that ntpd(1) -g is slower
than ntpdate(1).

Hopefully ntpd_sync_on_start="YES" can be made the default for -CURRENT
after 5.3 is cut.  At the very least, this should be set to YES when a
user requests to have ntpd enabled via sysinstall(1).

Requested by:	many
@
text
@d10 1
a10 1
# KEYWORD: FreeBSD nojail
@


1.10
log
@Stop using ntpdate(1) in our startup procedure.  Replace ntpdate(1) with
calls to ntpd -g.  ntpd is noticeably slower than ntpdate, but is also more
accurate.  This removes the nasty hackery in rc.d/ntpdate that would parse
out ntp servers from /etc/ntp.conf (ntpd knows how to read its own config
file).  By default, ntpd *will* sync with its listed time servers.  To
turn this off so that ntpd does not sync, ntpd_sync_on_start="NO" can be
added to /etc/rc.conf.  If ntpd is not enabled (the default), then time is
not synced on startup.  ntpdate has been depreciated by the ntpd authors
for quite some time so this change shouldn't be unexpected.

Suggested by:	des
Approved by:	roberto (resident ntp guru)
@
text
@d4 1
a4 1
# $FreeBSD: src/etc/rc.d/ntpdate,v 1.9 2004/03/29 20:00:54 des Exp $
d7 1
@


1.9
log
@Fix the case where $ntpdate_hosts was not specified and /etc/ntp.conf
does not exist.

Submitted by:	ru
@
text
@d4 1
a4 1
# $FreeBSD$
@


1.9.2.1
log
@RCS file: /home/ncvs/src/etc/rc,v
----------------------------
revision 1.335
date: 2004/10/08 14:23:49;  author: mtm;  state: Exp;  lines: +0 -1
Remove an unused variable.

Submitted by: Pawel Worach <pawel.worach@@telia.com>
----------------------------
revision 1.334
date: 2004/10/07 13:55:25;  author: mtm;  state: Exp;  lines: +1 -1
Remove the requirement for the FreeBSD keyword as it no longer
makes any sense.

Discussed with: dougb, brooks
MFC after: 3 days
=============================================================================
RCS file: /home/ncvs/src/etc/rc.d/nsswitch,v
----------------------------
revision 1.4
date: 2004/09/16 17:03:12;  author: keramida;  state: Exp;  lines: +1 -1
Fix requirement of `network' to `NETWORK' because the former isn't
provided by any rc.d script.

Approved by:	mtm
=============================================================================
RCS file: /home/ncvs/src/etc/rc.d/pflog,v
----------------------------
revision 1.3
date: 2004/09/16 17:04:20;  author: keramida;  state: Exp;  lines: +1 -1
We don't have any providers of `beforenetlkm' in FreeBSD.  Remove the
dependency to it from our rc.d scripts.

Approved by:	mtm
=============================================================================

Approved by: re/scottl
@
text
@d9 1
a9 1
# KEYWORD: nojail
@


1.9.2.2
log
@MFC revision 1.13:

	s/ntpdate_command/ntpdate_program/ to match rc.conf(5) and
	/etc/defaults/rc.conf.

Approved by:	murray (mentor)
@
text
@d28 1
a28 1
		${ntpdate_program:-ntpdate} $rc_flags $ntpdate_hosts
@


1.8
log
@Set start_cmd and stop_cmd correctly so the code that extracts the names
of the ntp servers from ntp.conf is actually used.  Remove pidfile since
ntpdate is not a daemon.
@
text
@d20 1
a20 1
	if [ -z "$ntpdate_hosts" ]; then
d26 1
a26 1
	if [ -n "$ntpdate_hosts"  ]; then
@


1.7
log
@Mark scripts as not usable inside a jail by adding keyword 'nojail'.

Some suggestions from:	rwatson, Ruben de Groot <mail25@@bzerk.org>
@
text
@d15 2
a16 3
command="/usr/sbin/${name}"
command_args=">/dev/null 2>&1"
pidfile="/var/run/${name}.pid"
d28 1
a28 1
		ntpdate $rc_flags $ntpdate_hosts
@


1.6
log
@Luke Mewburn has indicated that they (NetBSD) are not interested
in keeping the scripts under rc.d in sync with us. So, remove
NetBSD specific stuff (which made our scripts more complicated
than necessary).

The NetBSD ident string will be left intact, both for history and
also incase we wish to pull in future versions.
@
text
@d9 1
a9 1
# KEYWORD: FreeBSD
@


1.5
log
@Luke Mewburn has indicated that they (NetBSD) are not interested
in keeping the scripts under rc.d in sync with us. So, begin removal
of NetBSD specific stuff (which made our scripts more complicated
than necessary), starting with the NetBSD KEYWORD.
@
text
@d15 3
a17 12

case ${OSTYPE} in
FreeBSD)
	command="/usr/sbin/${name}"
	command_args=">/dev/null 2>&1"
	pidfile="/var/run/${name}.pid"
	;;
NetBSD)
	start_cmd="ntpdate_start"
	stop_cmd=":"
	;;
esac
@


1.4
log
@Fix style bugs:
* Space -> tabs conversion.
* Removed blanks before semicolon in "if ... ; then".
* Proper indentation of misindented lines.
* Put a full stop after some comments.
* Removed whitespace at end of line.

Approved by:	silence from gordon
@
text
@d9 1
a9 1
# KEYWORD: FreeBSD NetBSD
@


1.3
log
@Convert from `${CMD_OSTYPE}` to ${OSTYPE}. This saves a shell invocation on
OS-dependent case switches.
@
text
@d32 2
a33 2
		    /^server[ \t]*127.127/      {next}
		    /^(server|peer)/            {print $2}
@


1.2
log
@Merge in all the changes that Mike Makonnen has been maintaining for a
while. This is only the script pieces, the glue for the build comes next.

Submitted by:	Mike Makonnen <makonnen@@pacbell.net>
Reviewed by:	silence on -current and -hackers
Prodded by:	rwatson
@
text
@d16 1
a16 1
case `${CMD_OSTYPE}` in
@


1.1
log
@Initial revision
@
text
@d3 2
a4 1
# $NetBSD: ntpdate,v 1.5 2000/08/21 14:48:39 abs Exp $
d8 2
a9 1
# REQUIRE: NETWORK syslogd
d14 13
a26 3
rcvar=$name
start_cmd="ntpdate_start"
stop_cmd=":"
d32 2
a33 2
		    /^server[ \t]*127.127/	{next}
		    /^(server|peer)/		{print $2}
d38 1
a38 1
		ntpdate $ntpdate_flags $ntpdate_hosts
@


1.1.1.1
log
@Import the NetBSD 1.5 RC system.

Note that `rc' and `rc.shutdown' could not be imported because we already
have files with those names.
@
text
@@


1.1.1.2
log
@Sync with NetBSD's mainline.
@
text
@d3 1
a3 1
# $NetBSD: ntpdate,v 1.7 2002/01/31 01:26:06 lukem Exp $
d7 1
a7 1
# REQUIRE: NETWORKING syslogd
d26 1
a26 1
		ntpdate $rc_flags $ntpdate_hosts
@

