head	1.21;
access;
symbols
	RELENG_8_4:1.21.0.2
	RELENG_9_1_0_RELEASE:1.18.4.2.2.2
	RELENG_9_1:1.18.4.2.0.2
	RELENG_9_1_BP:1.18.4.2
	RELENG_8_3_0_RELEASE:1.18.2.2.2.1
	RELENG_8_3:1.18.2.2.0.2
	RELENG_8_3_BP:1.18.2.2
	RELENG_9_0_0_RELEASE:1.18.4.1.2.1
	RELENG_9_0:1.18.4.1.0.2
	RELENG_9_0_BP:1.18.4.1
	RELENG_9:1.18.0.4
	RELENG_9_BP:1.18
	RELENG_7_4_0_RELEASE:1.13.2.3.4.1
	RELENG_8_2_0_RELEASE:1.18.2.1.6.1
	RELENG_7_4:1.13.2.3.0.4
	RELENG_7_4_BP:1.13.2.3
	RELENG_8_2:1.18.2.1.0.6
	RELENG_8_2_BP:1.18.2.1
	RELENG_8_1_0_RELEASE:1.18.2.1.4.1
	RELENG_8_1:1.18.2.1.0.4
	RELENG_8_1_BP:1.18.2.1
	RELENG_7_3_0_RELEASE:1.13.2.3.2.1
	RELENG_7_3:1.13.2.3.0.2
	RELENG_7_3_BP:1.13.2.3
	RELENG_8_0_0_RELEASE:1.18.2.1.2.1
	RELENG_8_0:1.18.2.1.0.2
	RELENG_8_0_BP:1.18.2.1
	RELENG_8:1.18.0.2
	RELENG_8_BP:1.18
	RELENG_7_2_0_RELEASE:1.13.2.2.2.1
	RELENG_7_2:1.13.2.2.0.2
	RELENG_7_2_BP:1.13.2.2
	RELENG_7_1_0_RELEASE:1.13.2.1.2.1
	RELENG_6_4_0_RELEASE:1.11.2.3.2.1
	RELENG_7_1:1.13.2.1.0.2
	RELENG_7_1_BP:1.13.2.1
	RELENG_6_4:1.11.2.3.0.2
	RELENG_6_4_BP:1.11.2.3
	RELENG_7_0_0_RELEASE:1.13
	RELENG_6_3_0_RELEASE:1.11.2.2
	RELENG_7_0:1.13.0.4
	RELENG_7_0_BP:1.13
	RELENG_6_3:1.11.2.2.0.4
	RELENG_6_3_BP:1.11.2.2
	RELENG_7:1.13.0.2
	RELENG_7_BP:1.13
	RELENG_6_2_0_RELEASE:1.11.2.2
	RELENG_6_2:1.11.2.2.0.2
	RELENG_6_2_BP:1.11.2.2
	RELENG_5_5_0_RELEASE:1.8.2.1
	RELENG_5_5:1.8.2.1.0.6
	RELENG_5_5_BP:1.8.2.1
	RELENG_6_1_0_RELEASE:1.11.2.1
	RELENG_6_1:1.11.2.1.0.2
	RELENG_6_1_BP:1.11.2.1
	RELENG_6_0_0_RELEASE:1.11
	RELENG_6_0:1.11.0.4
	RELENG_6_0_BP:1.11
	RELENG_6:1.11.0.2
	RELENG_6_BP:1.11
	RELENG_5_4_0_RELEASE:1.8.2.1
	RELENG_5_4:1.8.2.1.0.4
	RELENG_5_4_BP:1.8.2.1
	RELENG_5_3_0_RELEASE:1.8.2.1
	RELENG_5_3:1.8.2.1.0.2
	RELENG_5_3_BP:1.8.2.1
	RELENG_5:1.8.0.2
	RELENG_5_BP:1.8
	RELENG_5_2_1_RELEASE:1.5
	RELENG_5_2_0_RELEASE:1.5
	RELENG_5_2:1.5.0.6
	RELENG_5_2_BP:1.5
	RELENG_5_1_0_RELEASE:1.5
	RELENG_5_1:1.5.0.4
	RELENG_5_1_BP:1.5
	RELENG_5_0_0_RELEASE:1.5
	RELENG_5_0:1.5.0.2
	RELENG_5_0_BP:1.5
	head_20020621:1.1.1.2
	head_20010615:1.1.1.1
	NETBSD:1.1.1;
locks; strict;
comment	@# @;


1.21
date	2012.11.17.01.49.05;	author svnexp;	state Exp;
branches
	1.21.2.1;
next	1.20;

1.20
date	2012.09.11.05.04.59;	author obrien;	state Exp;
branches;
next	1.19;

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

1.18
date	2009.05.30.21.51.38;	author dougb;	state Exp;
branches
	1.18.2.1
	1.18.4.1;
next	1.17;

1.17
date	2009.01.29.06.43.29;	author keramida;	state Exp;
branches;
next	1.16;

1.16
date	2009.01.27.20.13.24;	author keramida;	state Exp;
branches;
next	1.15;

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

1.14
date	2008.05.12.11.49.16;	author flz;	state Exp;
branches;
next	1.13;

1.13
date	2006.04.18.15.02.24;	author flz;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	2005.12.21.09.48.41;	author dougb;	state Exp;
branches;
next	1.11;

1.11
date	2005.01.16.03.12.03;	author obrien;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	2004.10.07.13.55.26;	author mtm;	state Exp;
branches;
next	1.9;

1.9
date	2004.09.14.03.01.38;	author seanc;	state Exp;
branches;
next	1.8;

1.8
date	2004.03.08.12.25.05;	author pjd;	state Exp;
branches
	1.8.2.1;
next	1.7;

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

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

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

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

1.3
date	2002.08.14.05.44.32;	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.21.2.1
date	2012.11.17.01.49.05;	author svnexp;	state dead;
branches;
next	1.21.2.2;

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

1.18.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.18.2.1.2.1
	1.18.2.1.4.1
	1.18.2.1.6.1;
next	1.18.2.2;

1.18.2.2
date	2012.02.14.10.17.14;	author dougb;	state Exp;
branches
	1.18.2.2.2.1;
next	1.18.2.3;

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

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

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

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

1.18.2.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.18.2.2.2.2;

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

1.18.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.18.4.1.2.1;
next	1.18.4.2;

1.18.4.2
date	2012.02.14.10.16.56;	author dougb;	state Exp;
branches
	1.18.4.2.2.1;
next	1.18.4.3;

1.18.4.3
date	2012.10.26.18.06.49;	author obrien;	state Exp;
branches;
next	1.18.4.4;

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

1.18.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.18.4.1.2.2;

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

1.18.4.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.18.4.2.2.2;

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

1.13.2.1
date	2008.05.19.09.20.04;	author flz;	state Exp;
branches
	1.13.2.1.2.1;
next	1.13.2.2;

1.13.2.2
date	2009.03.24.02.48.54;	author dougb;	state Exp;
branches
	1.13.2.2.2.1;
next	1.13.2.3;

1.13.2.3
date	2009.08.03.20.20.15;	author dougb;	state Exp;
branches
	1.13.2.3.2.1
	1.13.2.3.4.1;
next	1.13.2.4;

1.13.2.4
date	2012.02.14.10.17.30;	author dougb;	state Exp;
branches;
next	1.13.2.5;

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

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

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

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

1.13.2.3.4.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.13.2.3.4.2;

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

1.11.2.1
date	2006.01.17.06.45.05;	author dougb;	state Exp;
branches;
next	1.11.2.2;

1.11.2.2
date	2006.06.06.11.17.08;	author flz;	state Exp;
branches;
next	1.11.2.3;

1.11.2.3
date	2008.05.19.09.21.24;	author flz;	state Exp;
branches
	1.11.2.3.2.1;
next	1.11.2.4;

1.11.2.4
date	2009.08.03.20.22.02;	author dougb;	state Exp;
branches;
next	1.11.2.5;

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

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

1.8.2.1
date	2004.10.10.09.50.54;	author mtm;	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.21
log
@Switching exporter and resync
@
text
@#!/bin/sh
#
# $FreeBSD: head/etc/rc.d/ntpd 240336 2012-09-11 05:04:59Z obrien $
#

# PROVIDE: ntpd
# REQUIRE: DAEMON ntpdate FILESYSTEMS devfs
# BEFORE:  LOGIN
# KEYWORD: nojail shutdown

. /etc/rc.subr

name="ntpd"
rcvar="ntpd_enable"
command="/usr/sbin/${name}"
pidfile="/var/run/${name}.pid"
start_precmd="ntpd_precmd"

load_rc_config $name

ntpd_precmd()
{
	rc_flags="-c ${ntpd_config} ${ntpd_flags}"

	if checkyesno ntpd_sync_on_start; then
		rc_flags="-g $rc_flags"
	fi

	if [ -z "$ntpd_chrootdir" ]; then
		return 0;
	fi

	# If running in a chroot cage, ensure that the appropriate files
	# exist inside the cage, as well as helper symlinks into the cage
	# from outside.
	#
	# As this is called after the is_running and required_dir checks
	# are made in run_rc_command(), we can safely assume ${ntpd_chrootdir}
	# exists and ntpd isn't running at this point (unless forcestart
	# is used).
	#
	if [ ! -c "${ntpd_chrootdir}/dev/clockctl" ]; then
		rm -f "${ntpd_chrootdir}/dev/clockctl"
		( cd /dev ; /bin/pax -rw -pe clockctl "${ntpd_chrootdir}/dev" )
	fi
	ln -fs "${ntpd_chrootdir}/var/db/ntp.drift" /var/db/ntp.drift

	#	Change run_rc_commands()'s internal copy of $ntpd_flags
	#
	rc_flags="-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags"
}

run_rc_command "$1"
@


1.21.2.1
log
@file ntpd was added on branch RELENG_8_4 on 2013-03-28 13:02:44 +0000
@
text
@d1 53
@


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

# PROVIDE: ntpd
# REQUIRE: DAEMON ntpdate cleanvar devfs
# BEFORE:  LOGIN
# KEYWORD: nojail shutdown

. /etc/rc.subr

name="ntpd"
rcvar="ntpd_enable"
command="/usr/sbin/${name}"
pidfile="/var/run/${name}.pid"
start_precmd="ntpd_precmd"

load_rc_config $name

ntpd_precmd()
{
	rc_flags="-c ${ntpd_config} ${ntpd_flags}"

	if checkyesno ntpd_sync_on_start; then
		rc_flags="-g $rc_flags"
	fi

	if [ -z "$ntpd_chrootdir" ]; then
		return 0;
	fi

	# If running in a chroot cage, ensure that the appropriate files
	# exist inside the cage, as well as helper symlinks into the cage
	# from outside.
	#
	# As this is called after the is_running and required_dir checks
	# are made in run_rc_command(), we can safely assume ${ntpd_chrootdir}
	# exists and ntpd isn't running at this point (unless forcestart
	# is used).
	#
	if [ ! -c "${ntpd_chrootdir}/dev/clockctl" ]; then
		rm -f "${ntpd_chrootdir}/dev/clockctl"
		( cd /dev ; /bin/pax -rw -pe clockctl "${ntpd_chrootdir}/dev" )
	fi
	ln -fs "${ntpd_chrootdir}/var/db/ntp.drift" /var/db/ntp.drift

	#	Change run_rc_commands()'s internal copy of $ntpd_flags
	#
	rc_flags="-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags"
}

run_rc_command "$1"
@


1.20
log
@SVN rev 240336 on 2012-09-11 05:04:59Z by obrien

Simply things so that "#REQUIRE: FILESYSTEMS" means the file
systems are fully "ready to go".

'FILESYSTEMS' states: "This is a dummy dependency, for services which
require file systems to be mounted before starting."  However, we have
'var' which is was run after 'FILESYSTEMS' and can mount /var if it
already isn't mounted.  Furthermore, several scripts cannot use /var
until 'cleanvar' has done its thing.  Thus "FILESYSTEMS" hasn't really
meant all critical file systems are fully usable.
@
text
@d3 1
a3 1
# $FreeBSD$
@


1.19
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
@d7 1
a7 1
# REQUIRE: DAEMON ntpdate cleanvar devfs
@


1.18
log
@SVN rev 193119 on 2009-05-30 21:51:38Z by dougb

Small cleanup, add (spurious) quotation marks around the value
for name= to make these scripts consistent with the rest.
@
text
@d14 1
a14 1
rcvar=`set_rcvar`
@


1.18.4.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.18.4.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
@d14 1
a14 1
rcvar="ntpd_enable"
@


1.18.4.3
log
@SVN rev 242153 on 2012-10-26 18:06:49Z by obrien

MFC: r240336:
  Simply things so that "#REQUIRE: FILESYSTEMS" means the file
  systems are fully "ready to go".

  'FILESYSTEMS' states: "This is a dummy dependency, for services which
  require file systems to be mounted before starting."  However, we have
  'var' which is was run after 'FILESYSTEMS' and can mount /var if it
  already isn't mounted.  Furthermore, several scripts cannot use /var
  until 'cleanvar' has done its thing.  Thus "FILESYSTEMS" hasn't really
  meant all critical file systems are fully usable.
@
text
@d7 1
a7 1
# REQUIRE: DAEMON ntpdate FILESYSTEMS devfs
@


1.18.4.4
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/ntpd 242153 2012-10-26 18:06:49Z obrien $
@


1.18.4.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.18.4.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.1/etc/rc.d/ntpd 231653 2012-02-14 10:16:56Z dougb $
@


1.18.4.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.18.4.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/ntpd 193119 2009-05-30 21:51:38Z dougb $
@


1.18.2.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.18.2.2
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
@d14 1
a14 1
rcvar="ntpd_enable"
@


1.18.2.3
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/ntpd 231655 2012-02-14 10:17:14Z dougb $
@


1.18.2.2.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.18.2.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/8.3/etc/rc.d/ntpd 231655 2012-02-14 10:17:14Z dougb $
@


1.18.2.1.6.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.18.2.1.4.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.18.2.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.17
log
@SVN rev 187879 on 2009-01-29 06:43:29Z by keramida

Backout change 187782.  It inhibits ntpd from starting at all
when ntpd_sync_on_start is set.

Noticed by:	rafan
@
text
@d13 1
a13 1
name=ntpd
@


1.16
log
@SVN rev 187782 on 2009-01-27 20:13:24Z by keramida

When synchronizing the clock at system startup time, use both
the -g and -q options.  They do a slightly different thing and
both are necessary when the time difference is large.

Noticed by:	danger, in the forums
Approved by:	roberto
MFC after:	1 week
@
text
@d26 1
a26 1
		rc_flags="-q -g $rc_flags"
@


1.15
log
@SVN rev 180564 on 2008-07-16 19:50:29Z by dougb

Add the shutdown KEYWORD to those scripts that start persistent services
to allow them to do a "clean" shutdown.

I purposely avoided making changes to network-related stuff since the
system shutting down is pretty conclusive, and there may be complicated
dependencies on the network that I would rather not try to unravel.

I also skipped kerberos-related stuff for the reasons above, and
because I have no way to test it.
@
text
@d26 1
a26 1
		rc_flags="-g $rc_flags"
@


1.14
log
@Don't require a configuration file. Ntpd will be perfectly happy if there's
none or if the file doesn't exist (there's no ntp.conf in the base install).

PR:		conf/119592
Submitted by:	Renaud Waldura <renaud+freebsd@@waldura.org>
MFC after:	1 week
@
text
@d9 1
a9 1
# KEYWORD: nojail
@


1.13
log
@- Add new ntpd_config variable so that people can override it in rc.conf.
- Add default value in /etc/defaults/rc.conf.
- Add documentation bits to rc.conf(5).

Approved by:	cperciva (mentor)
MFC after:	1 week
@
text
@a20 2
required_files="${ntpd_config}"

@


1.13.2.1
log
@MFC: Don't require a configuration file. Ntpd will be perfectly happy if there's
none or if the file doesn't exist (there's no ntp.conf in the base install).

  src/etc/rc.d/ntpd: rev 1.13 -> 1.14
@
text
@d21 2
@


1.13.2.2
log
@SVN rev 190362 on 2009-03-24 02:48:54Z by dougb

MFC r180564, addition of the SHUTDOWN keyword to those scripts that
start persistent services.
@
text
@d9 1
a9 1
# KEYWORD: nojail shutdown
@


1.13.2.3
log
@SVN rev 196055 on 2009-08-03 20:20:15Z by dougb

MFC r193119, quotation marks around the value of name=
(i.e., diff reduction to HEAD)
@
text
@d13 1
a13 1
name="ntpd"
@


1.13.2.4
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
@d14 1
a14 1
rcvar="ntpd_enable"
@


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


1.13.2.3.4.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.13.2.3.4.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/ntpd 196055 2009-08-03 20:20:15Z dougb $
@


1.13.2.3.2.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.13.2.2.2.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.13.2.1.2.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.12
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
@d18 4
a21 1
required_files="/etc/ntp.conf"
d25 2
d28 1
a28 1
		rc_flags="-g ${ntpd_flags}"
a54 1
load_rc_config $name
@


1.11
log
@"REQUIRE: cleanvar" for all RC's writing into /var/run.
@
text
@a2 1
# $NetBSD: ntpd,v 1.6 2002/03/22 04:33:59 thorpej Exp $
d7 1
a7 1
# REQUIRE: DAEMON cleanvar
@


1.11.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
d8 1
a8 1
# REQUIRE: DAEMON ntpdate cleanvar devfs
@


1.11.2.2
log
@MFC:

  - Add new ntpd_config variable so that people can override it in rc.conf.
  - Add default value in /etc/defaults/rc.conf.
  - Add documentation bits to rc.conf(5).

      src/etc/rc.d/ntpd: rev 1.12 -> 1.13
      src/share/man/man5/rc.conf.5: rev 1.292 -> 1.293
      src/etc/defaults/rc.conf: rev 1.280 -> 1.281
@
text
@d18 1
a18 4

load_rc_config $name

required_files="${ntpd_config}"
a21 2
	rc_flags="-c ${ntpd_config} ${ntpd_flags}"

d23 1
a23 1
		rc_flags="-g $rc_flags"
d50 1
@


1.11.2.3
log
@MFC: Don't require a configuration file. Ntpd will be perfectly happy if there's
none or if the file doesn't exist (there's no ntp.conf in the base install).

  src/etc/rc.d/ntpd: rev 1.13 -> 1.14
@
text
@d21 2
@


1.11.2.4
log
@SVN rev 196056 on 2009-08-03 20:22:02Z by dougb

MFC r193119, quotation marks around the value of name=
(i.e., diff reduction to HEAD)
@
text
@d13 1
a13 1
name="ntpd"
@


1.11.2.5
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/ntpd 196056 2009-08-03 20:22:02Z dougb $
@


1.11.2.3.2.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.10
log
@Remove the requirement for the FreeBSD keyword as it no longer
makes any sense.

Discussed with: dougb, brooks
MFC after: 3 days
@
text
@d8 1
a8 1
# REQUIRE: DAEMON
@


1.9
log
@Stop using ntpdate(1) in our startup proceedure.  Replace ntpdate(1) with
calls to ntpd -g.  ntpd is noticably 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's use 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
@d10 1
a10 1
# KEYWORD: FreeBSD nojail
@


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

Some suggestions from:	rwatson, Ruben de Groot <mail25@@bzerk.org>
@
text
@d18 1
d23 4
@


1.8.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
@d10 1
a10 1
# KEYWORD: nojail
@


1.7
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
@d10 1
a10 1
# KEYWORD: FreeBSD
@


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, begin removal
of NetBSD specific stuff (which made our scripts more complicated
than necessary), starting with the NetBSD KEYWORD.
@
text
@a19 6
case ${OSTYPE} in
NetBSD)
	start_precmd="ntpd_precmd"
	;;
esac

@


1.5
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
@d10 1
a10 1
# KEYWORD: FreeBSD NetBSD
@


1.4
log
@Convert from `${CMD_OSTYPE}` to ${OSTYPE}. This saves a shell invocation on
OS-dependent case switches.
@
text
@d33 1
a33 1
	# exist inside the cage, as well as helper symlinks into the cage 
@


1.3
log
@Clean up the scripts to use the new variables:
xntpd_* -> ntpd_*
portmap_* -> rpcbind_*

Also change single_mountd_enable -> mountd_enable
Changing the mountd flags brings us closer to NetBSD.

All of the old variable names are shimmed so you can continue to use the
old variable name.

Finally make /etc/rc.d/mountd no longer dependent on nfs as there are
(apparently) other consumers of mountd.

Submitted by:	Mike Makonnen <makonnen@@pacbell.net>
@
text
@d20 1
a20 1
case `${CMD_OSTYPE}` in
@


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
@d14 6
a20 3
FreeBSD)
	name="xntpd"
	;;
a21 1
	name="ntpd"
a24 5

rcvar=`set_rcvar`
command="/usr/sbin/ntpd"
pidfile="/var/run/ntpd.pid"
required_files="/etc/ntp.conf"
@


1.1
log
@Initial revision
@
text
@d3 2
a4 1
# $NetBSD: ntpd,v 1.2 2000/05/13 08:45:07 lukem Exp $
d9 2
d14 13
a26 4
name="ntpd"
rcvar=$name
command="/usr/sbin/${name}"
pidfile="/var/run/${name}.pid"
d28 26
@


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: ntpd,v 1.8 2002/06/17 06:47:59 lukem Exp $
a7 2
# BEFORE:  LOGIN
# KEYWORD: chrootdir
a14 1
start_precmd="ntpd_precmd"
a15 30

ntpd_precmd()
{
	if [ -z "$ntpd_chrootdir" ]; then
		return 0;
	fi

	# If running in a chroot cage, ensure that the appropriate files
	# exist inside the cage, as well as helper symlinks into the cage 
	# from outside.
	#
	# As this is called after the is_running and required_dir checks
	# are made in run_rc_command(), we can safely assume ${ntpd_chrootdir}
	# exists and ntpd isn't running at this point (unless forcestart
	# is used).
	#
	# Before enabling ntpd_chrootdir, ensure that:
	#	- The kernel has "pseudo-device clockctl" compiled in
	#	- /dev/clockctl is present
	#
	if [ ! -c "${ntpd_chrootdir}/dev/clockctl" ]; then
		rm -f "${ntpd_chrootdir}/dev/clockctl"
		( cd /dev ; /bin/pax -rw -pe clockctl "${ntpd_chrootdir}/dev" )
	fi
	ln -fs "${ntpd_chrootdir}/var/db/ntp.drift" /var/db/ntp.drift

	#	Change run_rc_commands()'s internal copy of $ntpd_flags
	#
	rc_flags="-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags"
}
@

