dhcp: Fix installation of configuration files.

diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp
index c2f5aed0557230addc606acb68dc87f82859ee69..381309c2762883d9fe1579fc3e96ab4c89253b94 100644 (file)
--- 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 fa26b5cfb7143d04f8b0e5d0149d3fdebe8fcc2d..816a75d8721a700ad54f7b2474c2d7dc822324f2 100644 (file)
--- 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)