Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_...

[people/teissler/ipfire-2.x.git] / lfs / dhcp

diff --git a/lfs/dhcp b/lfs/dhcp
index 317eef4ed46369db5cf56b65a953fe1ead2720d5..083c31fa1107bc70daf28789d5d386f4893b8891 100644 (file)
--- 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)