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/dhcp | |
| parent | 9a5434fbfc98a0c427c880b167b8ca3499b44e87 (diff) | |
| parent | 9b47f40bb29d9be34afabfb423bab0ad45cbc11f (diff) | |
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/dhcp')
| -rw-r--r-- | package/dhcp/dhcp.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 27fb60b74..1eb6b3254 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -59,7 +59,7 @@ define DHCP_INSTALL_CLIENT mkdir -p $(TARGET_DIR)/var/lib (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) $(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient \ - $(TARGET_DIR)/usr/sbin/dhclient + $(TARGET_DIR)/sbin/dhclient $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ $(TARGET_DIR)/etc/dhcp/dhclient.conf $(INSTALL) -m 0755 -D package/dhcp/dhclient-script \ |