From 1cded5eefd1516f5e35f16086b4fde737907e20f Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 21 Sep 2012 14:06:37 +0200
Subject: [PATCH] dhcp: Fix installation of configuration files.

---
 config/rootfiles/common/dhcp | 5 +++--
 lfs/dhcp                     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp
index c2f5aed05..381309c27 100644
--- a/config/rootfiles/common/dhcp
+++ b/config/rootfiles/common/dhcp
@@ -1,5 +1,6 @@
-#etc/dhclient.conf
-etc/dhcpd.conf
+#etc/dhcp
+#etc/dhcp/dhclient.conf
+etc/dhcp/dhcpd.conf
 #usr/bin/omshell
 #usr/include/dhcpctl
 #usr/include/dhcpctl/dhcpctl.h
diff --git a/lfs/dhcp b/lfs/dhcp
index fa26b5cfb..816a75d87 100644
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -111,7 +111,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 \
@@ -123,6 +123,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)
-- 
2.39.2