From c30879d6212db2a1867ad679ed6432de0fb581e5 Mon Sep 17 00:00:00 2001
From: henning <>
Date: Sat, 18 Sep 2004 20:17:38 +0000
Subject: [PATCH] unconditionally add -s to ntpd_flags in rc and suggest "" for
 normal use in the comment in rc.conf again, idea & ok theo

---
 src/etc/rc      | 5 +++--
 src/etc/rc.conf | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index 2e798c26..93cdf6a9 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.252 2004/09/17 21:50:30 mcbride Exp $
+#	$OpenBSD: rc,v 1.253 2004/09/18 20:17:37 henning Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -315,7 +315,8 @@ if [ "X${timed_flags}" != X"NO" ]; then
 fi
 
 if [ "X${ntpd_flags}" != X"NO" ]; then
-	echo -n ' ntpd'; ntpd $ntpd_flags
+	# since this is system startup, use -s
+	echo -n ' ntpd'; ntpd -s $ntpd_flags
 fi
 echo '.'
 
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 13064a74..9f62cfca 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.101 2004/09/18 20:03:23 henning Exp $
+#	$OpenBSD: rc.conf,v 1.102 2004/09/18 20:17:38 henning Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -14,7 +14,7 @@ sshd_flags=""		# for normal use: ""
 named_flags=NO		# for normal use: ""
 rdate_flags=NO		# for normal use: [RFC868-host] or [-n RFC2030-host]
 timed_flags=NO		# for normal use: ""
-ntpd_flags=NO		# for normal use: "-s"
+ntpd_flags=NO		# for normal use: ""
 isakmpd_flags=NO	# for normal use: ""
 mopd_flags=NO		# for normal use: "-a"
 apmd_flags=NO		# for normal use: ""