From: eric.le.bihan.dev@free.fr Date: Tue, 7 Jan 2014 10:29:20 +0000 (+0100) Subject: network-manager: fix DHCP clients detection. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=16937a45db8847798f66a16a0e2e44969858b4c1;p=buildroot.git network-manager: fix DHCP clients detection. If either dhclient or dhcpcd are selected, network-manager is now configured with the proper paths. This allows 'dhcp=dhclient' or 'dhcp=dhcpcd' to be set in /etc/NetworkManager/NetworkManager.conf. Signed-off-by: Eric Le Bihan Signed-off-by: Peter Korsgaard --- diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 7c9cc88225..e847f25d88 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -34,6 +34,14 @@ NETWORK_MANAGER_CONF_OPT = \ --disable-ifupdown \ --disable-ifnet +ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) +NETWORK_MANAGER_CONF_OPT += --with-dhclient=/usr/sbin/dhclient +endif + +ifeq ($(BR2_PACKAGE_DHCPCD),y) +NETWORK_MANAGER_CONF_OPT += --with-dhcpcd=/usr/sbin/dhcpcd +endif + # uClibc by default doesn't have backtrace support, so don't use it ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) NETWORK_MANAGER_CONF_OPT += --disable-crashtrace