diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2004-07-06 04:03:42 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2004-07-06 04:03:42 +0000 |
| commit | 2c116e80aa8fc0cf9a250ecc1bc0324d841fbe53 (patch) | |
| tree | fd667209dc8b07dc538d047215b68c246e4b2659 | |
| parent | 8c47e48a7c891351c0703c9b6a8f236dc93acace (diff) | |
remove startup code for that other ntpd from ports and use the one
in base instead. theo ok & rush to go for beer
| -rw-r--r-- | etc/rc.conf | 5 | ||||
| -rw-r--r-- | etc/rc.local | 18 | ||||
| -rw-r--r-- | etc/rc.securelevel | 15 |
3 files changed, 4 insertions, 34 deletions
diff --git a/etc/rc.conf b/etc/rc.conf index 9e5a1e51e25..85ddb02b1e2 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.97 2004/06/04 04:26:41 grange Exp $ +# $OpenBSD: rc.conf,v 1.98 2004/07/06 04:03:41 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: "" -ntpdate_flags=NO # for normal use: NTP server; run before ntpd starts +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: "" @@ -59,7 +59,6 @@ pf=NO # Packet filter / NAT portmap=NO # Note: inetd(8) rpc services need portmap too inetd=YES # almost always needed check_quotas=YES # NO may be desirable in some YP environments -ntpd=YES # run ntpd if it exists krb5_master_kdc=NO # KerberosV master KDC. Run 'info heimdal' for help. krb5_slave_kdc=NO # KerberosV slave KDC. diff --git a/etc/rc.local b/etc/rc.local index d9c10fbbe8f..6aa2b4105e2 100644 --- a/etc/rc.local +++ b/etc/rc.local @@ -1,4 +1,4 @@ -# $OpenBSD: rc.local,v 1.35 2004/04/07 19:23:39 david Exp $ +# $OpenBSD: rc.local,v 1.36 2004/07/06 04:03:41 henning Exp $ # site-specific startup actions, daemons, and other things which # can be done AFTER your system goes into securemode. For actions @@ -10,22 +10,6 @@ echo -n 'starting local daemons:' -# run ntpdate prior to ntpd -if [ $securelevel -le 1 -a X"${ntpdate_flags}" != X"NO" \ - -a -x /usr/local/sbin/ntpdate ]; then - echo -n ' ntpdate' - /usr/local/sbin/ntpdate -b ${ntpdate_flags} >/dev/null -fi - -if [ X"${ntpd}" == X"YES" -a -x /usr/local/sbin/ntpd \ - -a -e /etc/ntp.conf ]; then - ntpd_flags="-p /var/run/ntpd.pid" - if [ $securelevel -ge 1 ]; then - ntpd_flags="${ntpd_flags} -x" - fi - echo -n ' ntpd'; /usr/local/sbin/ntpd ${ntpd_flags} -fi - if [ -x /usr/local/sbin/cfsd ]; then if ps auxc | grep -q '^ *root .* mountd$'; then echo -n ' cfsd'; /usr/local/sbin/cfsd >/dev/null 2>&1 diff --git a/etc/rc.securelevel b/etc/rc.securelevel index ae949dc4912..e7b1fc9351d 100644 --- a/etc/rc.securelevel +++ b/etc/rc.securelevel @@ -1,4 +1,4 @@ -# $OpenBSD: rc.securelevel,v 1.14 2000/07/13 16:26:13 millert Exp $ +# $OpenBSD: rc.securelevel,v 1.15 2004/07/06 04:03:41 henning Exp $ # # site-specific startup actions, daemons, and other things which # can be done BEFORE your system goes into securemode. For actions @@ -14,17 +14,4 @@ securelevel=1 echo -n 'starting pre-securelevel daemons:' - -# Securelevel > 1 does not allow the clock to be set backwards -if [ $securelevel -gt 1 -a X"${ntpdate_flags}" != X"NO" \ - -a -x /usr/local/sbin/ntpdate ]; then - echo -n ' ntpdate' - /usr/local/sbin/ntpdate -b ${ntpdate_flags} >/dev/null -fi - -if [ X"${ntpd}" == X"YES" -a -x /usr/local/sbin/tickadj \ - -a -e /etc/ntp.conf ]; then - echo -n ' tickadj'; /usr/local/sbin/tickadj -Aq -fi - echo '.' |