[Buildroot] [PATCH 1/2] dhcp: Fix config files paths
Benoît Thébaudeau
benoit.thebaudeau at advansee.com
Mon Aug 4 18:19:03 UTC 2014
The built dhcp binaries and the installed startup scripts used configuration
files under /etc/, but the configuration files were installed under /etc/dhcp/.
Fix everything to have configuration files under /etc/dhcp/.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau at advansee.com>
---
package/dhcp/S80dhcp-server | 2 +-
package/dhcp/dhcp.mk | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/package/dhcp/S80dhcp-server b/package/dhcp/S80dhcp-server
index 98bd3cc..5280c31 100755
--- a/package/dhcp/S80dhcp-server
+++ b/package/dhcp/S80dhcp-server
@@ -9,7 +9,7 @@ INTERFACES=""
# Sanity checks
test -f /usr/sbin/dhcpd || exit 0
-test -f /etc/dhcpd.conf || exit 0
+test -f /etc/dhcp/dhcpd.conf || exit 0
test -n "$INTERFACES" || exit 0
case "$1" in
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 1044f89..32dbea0 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -9,7 +9,10 @@ DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
DHCP_INSTALL_STAGING = YES
DHCP_LICENSE = ISC
DHCP_LICENSE_FILES = LICENSE
-DHCP_CONF_ENV = ac_cv_file__dev_random=yes
+DHCP_CONF_ENV = \
+ CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
+ -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \
+ ac_cv_file__dev_random=yes
DHCP_CONF_OPT = \
--localstatedir=/var/lib/dhcp \
--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
--
1.9.1
More information about the buildroot
mailing list