From: Hasso Tepper <hasso@dragonflybsd.org>
Date: Sat, 30 Aug 2008 16:40:17 +0000 (+0000)
Subject: Remove dhcpd and dhcrelay remainings.
X-Git-Tag: v2.1.1~550
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/5bb99a20da4ae61c517cf3be49cd3bce3fd8c4f4?ds=sidebyside

Remove dhcpd and dhcrelay remainings.
---

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 15d737537f..2b7f00f8b5 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -14,7 +14,7 @@
 # All arguments must be in double or single quotes.
 #
 # $FreeBSD: src/etc/defaults/rc.conf,v 1.180 2003/06/26 09:50:50 smkelly Exp $
-# $DragonFly: src/etc/defaults/rc.conf,v 1.50 2008/04/15 10:11:35 swildner Exp $
+# $DragonFly: src/etc/defaults/rc.conf,v 1.51 2008/08/30 16:40:17 hasso Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -55,8 +55,6 @@ hostname=""			# Set this!
 nisdomainname="NO"		# Set to NIS domain if using NIS (or NO).
 dhclient_program="/sbin/dhclient"	# Path to dhcp client program.
 dhclient_flags=""		# Additional flags to pass to dhcp client.
-dhcpd_enable="NO"		# Set to YES to enable the DHCP server
-dhcrelay_enable="NO"		# Set to YES to enable the DHCP relay server
 firewall_enable="NO"		# Set to YES to enable firewall functionality
 firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall
 firewall_type="UNKNOWN"		# Firewall type (see /etc/rc.firewall)
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index e0d75a80b1..934c470610 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
 # $FreeBSD: src/etc/rc.d/Makefile,v 1.20 2003/06/29 05:15:57 mtm Exp $
-# $DragonFly: src/etc/rc.d/Makefile,v 1.28 2008/02/01 09:05:28 hasso Exp $
+# $DragonFly: src/etc/rc.d/Makefile,v 1.29 2008/08/30 16:40:17 hasso Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,7 @@
 FILES=	DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz \
 	amd apm apmd atm1 atm2.sh atm3.sh \
 	battd bootconf bootparams btconfig bthcid ccd cleanvar \
-	cleartmp cron dhclient dhcpd dhcrelay diskless dmesg dumpon \
+	cleartmp cron dhclient diskless dmesg dumpon \
 	fsck ftpd hostapd hostname \
 	inetd initdiskless initrandom ip6fw ipfilter ipfs ipfw ipmon \
 	ipnat ipsec ipxrouted isdnd jail \
diff --git a/etc/rc.d/dhcpd b/etc/rc.d/dhcpd
deleted file mode 100644
index 453e88be8f..0000000000
--- a/etc/rc.d/dhcpd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: dhcpd,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/dhcpd,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/dhcpd,v 1.3 2005/11/19 21:47:32 swildner Exp $
-#
-
-# PROVIDE: dhcpd
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-
-. /etc/rc.subr
-
-name="dhcpd"
-rcvar=`set_rcvar`
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="/etc/${name}.conf /var/db/${name}.leases"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/dhcrelay b/etc/rc.d/dhcrelay
deleted file mode 100644
index 9f7dd1bd31..0000000000
--- a/etc/rc.d/dhcrelay
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: dhcrelay,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/dhcrelay,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/Attic/dhcrelay,v 1.3 2005/11/19 21:47:32 swildner Exp $
-#
-
-# PROVIDE: dhcrelay
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-
-. /etc/rc.subr
-
-name="dhcrelay"
-rcvar=`set_rcvar`
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-
-load_rc_config $name
-run_rc_command "$1"