| Message ID | 1407176344-13291-1-git-send-email-benoit.thebaudeau@advansee.com |
|---|---|
| State | Accepted |
| Headers | show |
Dear Benoît Thébaudeau, On Mon, 4 Aug 2014 20:19:03 +0200, Benoît Thébaudeau wrote: > 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@advansee.com> > --- > package/dhcp/S80dhcp-server | 2 +- > package/dhcp/dhcp.mk | 5 ++++- > 2 files changed, 5 insertions(+), 2 deletions(-) Both patches applied, thanks. As Gustavo rightfully pointed out, it would be nice to be able to define the value of INTERFACES without modifying the init script itself, for example using a /etc/default/dhcpd file. But this needs to be part of a more global work on our initscripts and skeleton. Thomas
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 \
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@advansee.com> --- package/dhcp/S80dhcp-server | 2 +- package/dhcp/dhcp.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)