diff options
| -rw-r--r-- | distrib/sets/lists/etc/mi | 1 | ||||
| -rw-r--r-- | etc/Makefile | 10 | ||||
| -rw-r--r-- | etc/changelist | 3 | ||||
| -rw-r--r-- | etc/dhcpd.interfaces | 7 | ||||
| -rw-r--r-- | etc/rc | 7 | ||||
| -rw-r--r-- | share/man/man8/dhcp.8 | 15 | ||||
| -rw-r--r-- | share/man/man8/intro.8 | 6 |
7 files changed, 12 insertions, 37 deletions
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi index cc570abbdff..82c36d5bbf9 100644 --- a/distrib/sets/lists/etc/mi +++ b/distrib/sets/lists/etc/mi @@ -16,7 +16,6 @@ ./etc/daily ./etc/dhclient.conf ./etc/dhcpd.conf -./etc/dhcpd.interfaces ./etc/disktab ./etc/dumpdates ./etc/dvmrpd.conf diff --git a/etc/Makefile b/etc/Makefile index 0abb58e1ad3..b8b4f833ba2 100644 --- a/etc/Makefile +++ b/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/etc/changelist b/etc/changelist index c7b8d3ca3fd..acbc079555c 100644 --- a/etc/changelist +++ b/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/etc/dhcpd.interfaces b/etc/dhcpd.interfaces deleted file mode 100644 index f06c4d8fcd4..00000000000 --- a/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 @@ -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 diff --git a/share/man/man8/dhcp.8 b/share/man/man8/dhcp.8 index 15441954411..23ae0f6d865 100644 --- a/share/man/man8/dhcp.8 +++ b/share/man/man8/dhcp.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dhcp.8,v 1.23 2007/05/31 19:19:59 jmc Exp $ +.\" $OpenBSD: dhcp.8,v 1.24 2008/06/08 03:03:37 jdixon Exp $ .\" .\" .\" Copyright (c) 1999 Aaron Campbell @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: June 8 2008 $ .Dt DHCP 8 .Os .Sh NAME @@ -90,14 +90,6 @@ and for details. .It Edit -.Pa /etc/dhcpd.interfaces . -This file should contain a list of interfaces you wish to serve by -.Xr dhcpd 8 . -If you have only one broadcast network interface or you wish to serve all -interfaces, this step is not required. -Be sure to leave this file empty (or even delete it) if this is the case. -.It -Edit .Pa /etc/rc.conf.local and set .Cm dhcpd_flags="" . @@ -127,9 +119,6 @@ Note, however, that most of the flags are useful only for debugging purposes. .Bl -tag -width /etc/dhcpd.interfaces -compact .It Pa /etc/dhcpd.conf DHCP server configuration file -.It Pa /etc/dhcpd.interfaces -list of network interfaces served by -.Xr dhcpd 8 .It Pa /etc/rc.conf.local configuration file where .Cm dhcpd_flags diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8 index 8447dc215c5..77f88a796a5 100644 --- a/share/man/man8/intro.8 +++ b/share/man/man8/intro.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: intro.8,v 1.15 2008/06/07 01:59:36 jdixon Exp $ +.\" $OpenBSD: intro.8,v 1.16 2008/06/08 03:03:37 jdixon Exp $ .\" $NetBSD: intro.8,v 1.3 1994/11/30 19:36:24 jtc Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)intro.8 8.2 (Berkeley) 12/11/93 .\" -.Dd $Mdocdate: June 7 2008 $ +.Dd $Mdocdate: June 8 2008 $ .Dt INTRO 8 .Os .Sh NAME @@ -198,8 +198,6 @@ If this is a BOOTP or DHCP server, edit .Pa /etc/dhcpd.conf -and -.Pa /etc/dhcpd.interfaces as needed. See also .Xr diskless 8 . |