From patchwork Mon Aug 4 18:19:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Th=C3=A9baudeau?= X-Patchwork-Id: 376419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 771521400F1 for ; Tue, 5 Aug 2014 04:27:07 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 944878B1FD; Mon, 4 Aug 2014 18:27:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TNjPlqMv-Uf6; Mon, 4 Aug 2014 18:27:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 68E278B1B6; Mon, 4 Aug 2014 18:26:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5C7EF1C2207 for ; Mon, 4 Aug 2014 18:26:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AD70F8B9BD for ; Mon, 4 Aug 2014 18:26:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L-aPaBThJ3Ui for ; Mon, 4 Aug 2014 18:26:47 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from zose-mta03.web4all.fr (zose-mta03.web4all.fr [185.49.20.44]) by whitealder.osuosl.org (Postfix) with ESMTP id B9D858681E for ; Mon, 4 Aug 2014 18:26:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by zose-mta03.web4all.fr (Postfix) with ESMTP id A7E5544876 for ; Mon, 4 Aug 2014 20:19:12 +0200 (CEST) Received: from zose-mta03.web4all.fr ([127.0.0.1]) by localhost (zose-mta03.web4all.fr [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 8i1kzSn528sZ; Mon, 4 Aug 2014 20:19:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zose-mta03.web4all.fr (Postfix) with ESMTP id 38D1144875; Mon, 4 Aug 2014 20:19:08 +0200 (CEST) X-Virus-Scanned: amavisd-new at zose-mta-03.w4a.fr Received: from zose-mta03.web4all.fr ([127.0.0.1]) by localhost (zose-mta03.web4all.fr [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id X_6gY_r9a12o; Mon, 4 Aug 2014 20:19:08 +0200 (CEST) Received: from localhost.localdomain (cie44-1-88-188-188-147.fbx.proxad.net [88.188.188.147]) by zose-mta03.web4all.fr (Postfix) with ESMTPSA id 0490E44872; Mon, 4 Aug 2014 20:19:07 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= To: Date: Mon, 4 Aug 2014 20:19:03 +0200 Message-Id: <1407176344-13291-1-git-send-email-benoit.thebaudeau@advansee.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Cc: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Subject: [Buildroot] [PATCH 1/2] dhcp: Fix config files paths X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 --- 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 \