X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fdhcp;h=083c31fa1107bc70daf28789d5d386f4893b8891;hp=317eef4ed46369db5cf56b65a953fe1ead2720d5;hb=26922c33eb91951c79c5b6a5e959a5adbf20bc9b;hpb=e0027e6cdc8fb4b7849430aa805a0314fef2b6a7

diff --git a/lfs/dhcp b/lfs/dhcp
index 317eef4ed..083c31fa1 100644
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -71,8 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-3.1_linux3.patch
-
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-remove-bind.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.0-errwarn-message.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-4.2.2-options.patch
@@ -114,7 +112,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
-			--sysconfdir=/etc \
+			--sysconfdir=/etc/dhcp \
 			--with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
 			--disable-static \
 			--enable-paranoia \
@@ -127,6 +125,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	mkdir -pv /var/state/dhcp
 	touch /var/state/dhcp/dhcpd.leases
 
-	ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf
+	ln -svf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)