From 43780b1a5c522eb640f90aa74f6a328fe00353c6 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Thu, 17 Mar 2016 10:42:10 -0700 Subject: Revert "Remove references to deleted dhcpcd" This reverts commit 7b2cbd478e94f28b2fa7e7ff355366dc5146f4f2. --- android_dhcpcd.conf | 9 +++++++++ device.mk | 1 + init.hikey.rc | 14 ++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 android_dhcpcd.conf 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 diff --git a/device.mk b/device.mk index bda7ebf7..15a21c00 100644 --- a/device.mk +++ b/device.mk @@ -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 -- cgit v1.2.3