aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@hackbox.linaro.org>2014-11-28 09:28:09 +0000
committerVishal Bhoj <vishal.bhoj@hackbox.linaro.org>2014-11-28 09:30:07 +0000
commit2fb0efdf5c70b18fcddbc91331167f4fa1ddea5f (patch)
tree52f4f1e15cb0b61824e10a7d7e3d59fb3270a4d9
parent6cfa906eca28621314d81951ef8732e72d1fc6a5 (diff)
downloadvexpress-2fb0efdf5c70b18fcddbc91331167f4fa1ddea5f.tar.gz
Fix ethernet: We need to pass dhcpcd.conf file
and set the dhcpcd service correctly in init.rc file Change-Id: Ida9f33b2953fc37a3dae1e2b0074e67f93c4f061 Signed-off-by: Vishal Bhoj <vishal.bhoj@hackbox.linaro.org>
-rw-r--r--android-quirks.conf1
-rw-r--r--dhcpcd/Android.mk7
-rw-r--r--dhcpcd/android_dhcpcd.conf9
-rwxr-xr-xinit.arm-versatileexpress.rc11
4 files changed, 19 insertions, 9 deletions
diff --git a/android-quirks.conf b/android-quirks.conf
index 548c863..56e8272 100644
--- a/android-quirks.conf
+++ b/android-quirks.conf
@@ -1,3 +1,4 @@
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
+CONFIG_IPV6=y
diff --git a/dhcpcd/Android.mk b/dhcpcd/Android.mk
new file mode 100644
index 0000000..4886210
--- /dev/null
+++ b/dhcpcd/Android.mk
@@ -0,0 +1,7 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE := dhcpcd.conf
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/dhcpcd
+LOCAL_SRC_FILES := android_dhcpcd.conf
+include $(BUILD_PREBUILT)
diff --git a/dhcpcd/android_dhcpcd.conf b/dhcpcd/android_dhcpcd.conf
new file mode 100644
index 0000000..b39ad73
--- /dev/null
+++ b/dhcpcd/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 eth0
+# dhcpcd-run-hooks uses these options.
+option subnet_mask, routers, domain_name_servers, interface_mtu
diff --git a/init.arm-versatileexpress.rc b/init.arm-versatileexpress.rc
index edacede..9f07c13 100755
--- a/init.arm-versatileexpress.rc
+++ b/init.arm-versatileexpress.rc
@@ -59,12 +59,12 @@ service faketsd /system/bin/faketsd
group bluetooth
oneshot
-service dhcpcd_eth0 /system/bin/dhcpcd -aABDKL eth0
+service dhcpcd_eth0 /system/bin/dhcpcd -aABDKL
class main
disabled
oneshot
-service iprenew_eth0 /system/bin/dhcpcd -n eth0
+service iprenew_eth0 /system/bin/dhcpcd -n
class late_start
disabled
oneshot
@@ -75,10 +75,3 @@ service gatord /system/bin/gatord -c /data/misc/gatord/configuration.xml
oneshot
seclabel u:r:gatord:s0
-on property:sys.boot_completed=1
- start dns_eth0
-
-service dns_eth0 /system/bin/sh /system/bin/eth0_dns.sh
- disabled
- oneshot
- seclabel u:r:shell:s0