diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2004-09-18 20:17:39 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2004-09-18 20:17:39 +0000 |
| commit | 0b3188495a6a821ce58ae4d3091d63458744a562 (patch) | |
| tree | 78a6efa80db7dd732179df5da2dcfe7b696d63ba /etc | |
| parent | 0d2a0c9d2331acd7b6cdaf4abbae4442c0575c4a (diff) | |
unconditionally add -s to ntpd_flags in rc and suggest "" for normal
use in the comment in rc.conf again, idea & ok theo
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc | 5 | ||||
| -rw-r--r-- | etc/rc.conf | 4 |
2 files changed, 5 insertions, 4 deletions
@@ -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/etc/rc.conf b/etc/rc.conf index 13064a74a01..9f62cfca3ce 100644 --- a/etc/rc.conf +++ b/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: "" |