summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreric.le.bihan.dev@free.fr <eric.le.bihan.dev@free.fr>2014-01-07 11:29:20 +0100
committerPeter Korsgaard <peter@korsgaard.com>2014-01-09 13:17:48 +0100
commit16937a45db8847798f66a16a0e2e44969858b4c1 (patch)
treefbf146d45f8f9f68f4f11015c3d93ac98c50d2ad
parenta4c1e0d77a88f791be1bf6f9e186929ca0c84559 (diff)
downloadbuildroot-16937a45db8847798f66a16a0e2e44969858b4c1.tar.gz
buildroot-16937a45db8847798f66a16a0e2e44969858b4c1.zip
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>
-rw-r--r--package/network-manager/network-manager.mk8
1 files changed, 8 insertions, 0 deletions
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
OpenPOWER on IntegriCloud