diff --git a/src/etc/Makefile b/src/etc/Makefile index 0abb58e1..b8b4f833 100644 --- a/src/etc/Makefile +++ b/src/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.264 2008/05/25 14:17:51 sobrado Exp $ +# $OpenBSD: Makefile,v 1.265 2008/06/08 03:03:37 jdixon Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -13,10 +13,10 @@ NOOBJ= oobj BINOWN= root BINGRP= wheel BIN1= changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \ - dhcpd.interfaces exports ftpusers ftpchroot gettytab group hosts \ - hosts.lpd inetd.conf ksh.kshrc locate.rc man.conf monthly motd \ - mrouted.conf myname netstart networks newsyslog.conf phones printcap \ - protocols rbootd.conf rc rc.conf rc.local rc.securelevel rc.shutdown \ + exports ftpusers ftpchroot gettytab group hosts hosts.lpd inetd.conf \ + ksh.kshrc locate.rc man.conf monthly motd mrouted.conf myname \ + netstart networks newsyslog.conf phones printcap protocols \ + rbootd.conf rc rc.conf rc.local rc.securelevel rc.shutdown \ remote rpc security services shells syslog.conf weekly \ etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \ moduli pf.os sensorsd.conf ifstated.conf diff --git a/src/etc/changelist b/src/etc/changelist index c7b8d3ca..acbc0795 100644 --- a/src/etc/changelist +++ b/src/etc/changelist @@ -1,4 +1,4 @@ -# $OpenBSD: changelist,v 1.56 2008/01/31 14:18:03 reyk Exp $ +# $OpenBSD: changelist,v 1.57 2008/06/08 03:03:37 jdixon Exp $ # # List of files which the security script backs up and checks # for modifications. @@ -25,7 +25,6 @@ /etc/defaultdomain /etc/dhclient.conf /etc/dhcpd.conf -/etc/dhcpd.interfaces /etc/disktab /etc/distfile /etc/dvmrpd.conf diff --git a/src/etc/dhcpd.interfaces b/src/etc/dhcpd.interfaces deleted file mode 100644 index f06c4d8f..00000000 --- a/src/etc/dhcpd.interfaces +++ /dev/null @@ -1,7 +0,0 @@ -# $OpenBSD: dhcpd.interfaces,v 1.1 1998/08/19 04:25:45 form Exp $ -# -# List of network interfaces served by dhcpd(8). -# -# ep0 -# ed0 le0 -# de1 diff --git a/src/etc/rc b/src/etc/rc index 6956d1c9..fdd48ef1 100644 --- a/src/etc/rc +++ b/src/etc/rc @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.314 2008/06/02 16:33:39 jasper Exp $ +# $OpenBSD: rc,v 1.315 2008/06/08 03:03:37 jdixon Exp $ # System startup script run by init on autoboot # or after single-user. @@ -612,10 +612,7 @@ fi if [ X"${dhcpd_flags}" != X"NO" -a -f /etc/dhcpd.conf ]; then touch /var/db/dhcpd.leases - if [ -f /etc/dhcpd.interfaces ]; then - dhcpd_ifs=`stripcom /etc/dhcpd.interfaces` - fi - echo -n ' dhcpd'; /usr/sbin/dhcpd ${dhcpd_flags} ${dhcpd_ifs} + echo -n ' dhcpd'; /usr/sbin/dhcpd ${dhcpd_flags} fi if [ X"${dhcrelay_flags}" != X"NO" ]; then