diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2016-03-17 10:42:10 -0700 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-03-17 10:42:10 -0700 |
commit | 43780b1a5c522eb640f90aa74f6a328fe00353c6 (patch) | |
tree | f13add7906f90b159e8c36043f87704a9421cb0b | |
parent | 5661d933953ecf3d2f369c6c413259d58218bf54 (diff) | |
download | hikey-43780b1a5c522eb640f90aa74f6a328fe00353c6.tar.gz |
Revert "Remove references to deleted dhcpcd"
This reverts commit 7b2cbd478e94f28b2fa7e7ff355366dc5146f4f2.
-rw-r--r-- | android_dhcpcd.conf | 9 | ||||
-rw-r--r-- | device.mk | 1 | ||||
-rw-r--r-- | init.hikey.rc | 14 |
3 files changed, 24 insertions, 0 deletions
diff --git a/android_dhcpcd.conf b/android_dhcpcd.conf new file mode 100644 index 00000000..0fe39969 --- /dev/null +++ b/android_dhcpcd.conf @@ -0,0 +1,9 @@ +# dhcpcd configuration for Android Wi-Fi interface +# See dhcpcd.conf(5) for details. + +# Disable solicitation of IPv6 Router Advertisements +noipv6rs + +interface wlan0 +# dhcpcd-run-hooks uses these options. +option subnet_mask, routers, domain_name_servers, interface_mtu @@ -89,6 +89,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \ device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \ + device/linaro/hikey/android_dhcpcd.conf:system/etc/dhcpcd/dhcpcd.conf \ device/linaro/hikey/audio/audio_policy.conf:system/etc/audio_policy.conf # Copy media codecs config file diff --git a/init.hikey.rc b/init.hikey.rc index 38d6bb4c..3cd6fce2 100644 --- a/init.hikey.rc +++ b/init.hikey.rc @@ -92,3 +92,17 @@ service wpa_supplicant /system/bin/wpa_supplicant \ disabled oneshot +service dhcpcd_wlan0 /system/bin/dhcpcd -dABKL + group dhcp + disabled + oneshot + +service dhcpcd_eth0 /system/bin/dhcpcd -dABKL + group dhcp + disabled + oneshot + +service dhcpcd_bt-pan /system/bin/dhcpcd -dABKL + group dhcp + disabled + oneshot |