Browse Source

Deprecate /etc/dhcpd.interfaces. This is made unnecessary by dhcpd_flags.

ok deraadt@ beck@ reyk@ phessler@
OPENBSD_4_4
jdixon 16 years ago
parent
commit
b81ea3f002
4 changed files with 8 additions and 19 deletions
  1. +5
    -5
      src/etc/Makefile
  2. +1
    -2
      src/etc/changelist
  3. +0
    -7
      src/etc/dhcpd.interfaces
  4. +2
    -5
      src/etc/rc

+ 5
- 5
src/etc/Makefile View File

@ -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 TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -13,10 +13,10 @@ NOOBJ= oobj
BINOWN= root BINOWN= root
BINGRP= wheel BINGRP= wheel
BIN1= changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \ 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 \ remote rpc security services shells syslog.conf weekly \
etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \ etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
moduli pf.os sensorsd.conf ifstated.conf moduli pf.os sensorsd.conf ifstated.conf


+ 1
- 2
src/etc/changelist View File

@ -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 # List of files which the security script backs up and checks
# for modifications. # for modifications.
@ -25,7 +25,6 @@
/etc/defaultdomain /etc/defaultdomain
/etc/dhclient.conf /etc/dhclient.conf
/etc/dhcpd.conf /etc/dhcpd.conf
/etc/dhcpd.interfaces
/etc/disktab /etc/disktab
/etc/distfile /etc/distfile
/etc/dvmrpd.conf /etc/dvmrpd.conf


+ 0
- 7
src/etc/dhcpd.interfaces View File

@ -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

+ 2
- 5
src/etc/rc View File

@ -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 # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -612,10 +612,7 @@ fi
if [ X"${dhcpd_flags}" != X"NO" -a -f /etc/dhcpd.conf ]; then if [ X"${dhcpd_flags}" != X"NO" -a -f /etc/dhcpd.conf ]; then
touch /var/db/dhcpd.leases 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 fi
if [ X"${dhcrelay_flags}" != X"NO" ]; then if [ X"${dhcrelay_flags}" != X"NO" ]; then


Loading…
Cancel
Save