diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:15:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:16:42 +0100 |
| commit | fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb (patch) | |
| tree | fd6edbe93b19b167b105897e3de6a7c11eac4f9c /package/network-manager | |
| parent | 9a5434fbfc98a0c427c880b167b8ca3499b44e87 (diff) | |
| parent | 9b47f40bb29d9be34afabfb423bab0ad45cbc11f (diff) | |
| download | buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.tar.gz buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.zip | |
Merge branch 'next'
Conflicts:
Makefile
package/flac/0001-fix-altivec-logic.patch
package/grantlee/Config.in
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/network-manager')
| -rwxr-xr-x | package/network-manager/S45network-manager | 2 | ||||
| -rw-r--r-- | package/network-manager/network-manager.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/network-manager/S45network-manager b/package/network-manager/S45network-manager index 78808912bf..5f32398e6b 100755 --- a/package/network-manager/S45network-manager +++ b/package/network-manager/S45network-manager @@ -8,7 +8,7 @@ NETWORKMANAGER_BIN=${sbindir}/NetworkManager [ -x $NETWORKMANAGER_BIN ] || exit 0 -PID=`pidof -o %PPID NetworkManager` +PID=`pidof NetworkManager` case "$1" in start) echo -n "Starting NetworkManager ... " diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 79442543db..9770cae94a 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -56,11 +56,11 @@ else endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/usr/sbin/dhclient +NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient endif ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/usr/sbin/dhcpcd +NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd endif # uClibc by default doesn't have backtrace support, so don't use it |
