network-manager: fix DHCP support.

This patch series fixes DHCP support for NetworkManager.

The DHCP client used by NetworkManager can be configured in the "[main]" section of /etc/NetworkManager/NetworkManager.conf either as:

dhcp=dhclient

or

dhcp=dhcpcd

The support for either client is enabled by the './configure' script. When network-manager was built, the instance of the client installed on the development machine was detected and its location used. Most of the time, this resulted in dhclient being the only choice...

This patch series:

- installs dhcpcd in the proper directory.
- configures network-manager according to the DHCP client package selected.
- bumps network-manager to its latest version.

Best regards,
ELB

Eric Le Bihan (3):
dhcpcd: install dhcpcd as /usr/sbin/dhcpcd.
network-manager: fix DHCP clients detection.
network-manager: bump to version 0.9.8.2

 package/dhcpcd/dhcpcd.mk                   |    2 +-
 package/network-manager/network-manager.mk |   10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

--
1.7.9.5

GNU/Linux distributions usually install dhcpcd in /usr/sbin. NetworkManager will look for it in this directory.

---
 package/dhcpcd/dhcpcd.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 8037706..01ced3a 100644
@@ -32,7 +32,7 @@ endef
 
 define DHCPCD_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/dhcpcd \
-		$(TARGET_DIR)/usr/bin/dhcpcd
+		$(TARGET_DIR)/usr/sbin/dhcpcd
 	$(INSTALL) -D -m 0644 $(@D)/dhcpcd.conf \
 		$(TARGET_DIR)/etc/dhcpcd.conf
 	$(INSTALL) -D -m 0755 $(@D)/dhcpcd-run-hooks \

1.7.9.5

(It should live in sbin regardless!)
Regards.

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.

---
 package/network-manager/network-manager.mk |    8 ++++++++
 1 file changed, 8 insertions(+)

index 7c9cc88..e847f25 100644
@@ -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

1.7.9.5

---
 package/network-manager/network-manager.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index e847f25..cd8b528 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 NETWORK_MANAGER_VERSION_MAJOR = 0.9
-NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).8.0
+NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).8.2
 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
 NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
 NETWORK_MANAGER_INSTALL_STAGING = YES

1.7.9.5

Committed series, thanks.

Bye, Peter Korsgaard