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

1 files changed, 43 insertions, 5 deletions

diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd
index b09c4d1..81671a1 100755
--- a/etc/rc.d/ntpd
+++ b/etc/rc.d/ntpd
@@ -1,18 +1,56 @@
 #!/bin/sh
 #
-# $NetBSD: ntpd,v 1.2 2000/05/13 08:45:07 lukem Exp $
+# $NetBSD: ntpd,v 1.6 2002/03/22 04:33:59 thorpej Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: ntpd
 # REQUIRE: DAEMON
+# BEFORE:  LOGIN
+# KEYWORD: FreeBSD NetBSD
 
 . /etc/rc.subr
 
-name="ntpd"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
+case `${CMD_OSTYPE}` in
+FreeBSD)
+	name="xntpd"
+	;;
+NetBSD)
+	name="ntpd"
+	start_precmd="ntpd_precmd"
+	;;
+esac
+
+rcvar=`set_rcvar`
+command="/usr/sbin/ntpd"
+pidfile="/var/run/ntpd.pid"
 required_files="/etc/ntp.conf"
 
+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).
+	#
+	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"
+}
+
 load_rc_config $name
 run_rc_command "$1"