diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-07-07 21:01:00 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-07-07 21:01:00 +0000 |
| commit | aa8f00f72023e768d8aa6923f7678cd709a10702 (patch) | |
| tree | 4fd25e0633b0f3e2a4cc5e307b4f8e524826a296 /etc | |
| parent | c3785e5755298479f2016257ae5995e5eff60df2 (diff) | |
timed's time is up. use ntpd(8). Even our own fossil developers
switched a while back.
ok miod, kettenis
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 12 | ||||
| -rw-r--r-- | etc/rc | 6 | ||||
| -rw-r--r-- | etc/rc.conf | 3 | ||||
| -rw-r--r-- | etc/rc.d/timed | 11 |
4 files changed, 10 insertions, 22 deletions
diff --git a/etc/Makefile b/etc/Makefile index 7bea3d533f6..fffeaf7d02e 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.299 2011/07/07 02:22:11 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.300 2011/07/07 21:00:59 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -32,11 +32,11 @@ BIN2= motd # -r-xr-xr-x RCDAEMONS= apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd ftpd ftpproxy \ - hostapd hotplugd httpd identd ifstated iked inetd isakmpd ldapd \ - ldattach ldpd lpd mopd mrouted named nsd ntpd portmap rarpd \ - rbootd relayd ripd route6d rtadvd rtsold rwhod sasyncd sendmail \ - sensorsd smtpd snmpd sshd syslogd timed watchdogd ypbind ypldap \ - yppasswdd ypserv + hostapd hotplugd httpd identd ifstated iked inetd isakmpd \ + ldapd ldattach ldpd lpd mopd mrouted named nsd ntpd portmap \ + rarpd rbootd relayd ripd route6d rtadvd rtsold rwhod sasyncd \ + sendmail sensorsd smtpd snmpd sshd syslogd watchdogd ypbind \ + ypldap yppasswdd ypserv MISETS= base${OSrev}.tgz comp${OSrev}.tgz \ man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.357 2011/07/07 20:54:05 deraadt Exp $ +# $OpenBSD: rc,v 1.358 2011/07/07 21:00:59 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. @@ -435,12 +435,12 @@ if [ X"${amd}" = X"YES" -a -e ${amd_master} ]; then (cd /etc/amd; amd `cat ${amd_master}`) fi -# run rdate before timed/ntpd +# run rdate before ntpd if [ X"${rdate_flags}" != X"NO" ]; then echo -n ' rdate'; rdate -s ${rdate_flags} fi -start_daemon timed ldattach ntpd +start_daemon ldattach ntpd echo '.' diff --git a/etc/rc.conf b/etc/rc.conf index 3f8f56a1d30..536eefc8593 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.145 2011/07/07 18:17:50 ajacoutot Exp $ +# $OpenBSD: rc.conf,v 1.146 2011/07/07 21:00:59 deraadt Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags ldpd_flags=NO # for normal use: "" @@ -18,7 +18,6 @@ sshd_flags="" # for normal use: "" named_flags=NO # for normal use: "" nsd_flags=NO # for normal use: "" rdate_flags=NO # for normal use: [RFC868-host] or [-n RFC2030-host] -timed_flags=NO # for normal use: "" ldattach_flags=NO # for normal use: "[options] linedisc cua-device" ntpd_flags=NO # for normal use: "" isakmpd_flags=NO # for normal use: "" diff --git a/etc/rc.d/timed b/etc/rc.d/timed deleted file mode 100644 index b0e7b214489..00000000000 --- a/etc/rc.d/timed +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: timed,v 1.1 2011/07/06 18:55:36 robert Exp $ - -daemon="/usr/sbin/timed" - -. /etc/rc.d/rc.subr - -rc_reload=NO - -rc_cmd $1 |