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 <eric.le.bihan.dev@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 7c9cc8822558d371ad4921edde7e58feaec6c7a2..e847f25d88b6852e848a4109bbd9a34020a1ff71 100644 (file)
--- 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