summaryrefslogtreecommitdiff
path: root/etc/rc
diff options
context:
space:
mode:
authorJason Dixon <jdixon@cvs.openbsd.org>2008-06-08 03:03:38 +0000
committerJason Dixon <jdixon@cvs.openbsd.org>2008-06-08 03:03:38 +0000
commitacb27b9cf9b58698cf1e68345d729d548c4839de (patch)
treeca01278b1455c7405856854b9d21be451590fa6f /etc/rc
parentd55333f7c0e0be12e82f8eaa70215e6aa9b421d4 (diff)
Deprecate /etc/dhcpd.interfaces. This is made unnecessary by dhcpd_flags.
ok deraadt@ beck@ reyk@ phessler@
Diffstat (limited to 'etc/rc')
-rw-r--r--etc/rc7
1 files changed, 2 insertions, 5 deletions
diff --git a/etc/rc b/etc/rc
index 6956d1c93a0..fdd48ef1d25 100644
--- a/etc/rc
+++ b/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