diff options
| author | Yongqin Liu of Linaro <yongqin.liu@linaro.org> | 2014-12-01 02:52:00 +0000 |
|---|---|---|
| committer | Linaro Android Code Review <android-review@review.linaro.org> | 2014-12-01 02:52:00 +0000 |
| commit | 4752dab9a9196ded4722f84cb4219bcc360bf0ba (patch) | |
| tree | 9bff6a99a1ace5d977481d3acfff40296d72b059 | |
| parent | f908a969a744f52c40e461c8505d572609f32bb1 (diff) | |
| parent | 53f7f37308e281fb04164c0629da5e3b58712413 (diff) | |
| download | fvp-armv8-4752dab9a9196ded4722f84cb4219bcc360bf0ba.tar.gz | |
Merge "Fix ethernet: We need to pass dhcpcd.conf file" into linaro-fvp-lollipop
| -rw-r--r-- | device.mk | 4 | ||||
| -rw-r--r-- | dhcpcd/Android.mk | 7 | ||||
| -rw-r--r-- | dhcpcd/android_dhcpcd.conf | 9 | ||||
| -rwxr-xr-x | init.fvpbase.rc | 19 |
4 files changed, 26 insertions, 13 deletions
@@ -48,6 +48,9 @@ PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh # Build and run only ART PRODUCT_RUNTIMES := runtime_libart_default +# Copy dhcpcd +PRODUCT_PACKAGES += dhcpcd.conf + # Set zygote config PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc @@ -65,6 +68,7 @@ ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter="" PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ device/linaro/build/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \ frameworks/native/data/etc/android.software.backup.xml:system/etc/permissions/android.software.backup.xml \ + frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \ frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml) PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ 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.fvpbase.rc b/init.fvpbase.rc index a7e0f42..68b2800 100755 --- a/init.fvpbase.rc +++ b/init.fvpbase.rc @@ -78,26 +78,19 @@ on boot # enable test harness setprop ro.test_harness true - # Setup paths used for socket communication with the dhcp daemon (dhcpd) - mkdir /data/misc/dhcp 0770 dhcp dhcp - chown dhcp dhcp /data/misc/dhcp - -service dhcpcd_eth0 /system/bin/dhcpcd -dABKL eth0 +service dhcpcd_eth0 /system/bin/dhcpcd -aABDKL class main group dhcp oneshot +service iprenew_eth0 /system/bin/dhcpcd -n + class late_start + disabled + oneshot + service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated class late_start -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 - service gatord /system/bin/gatord -c /data/misc/gatord/configuration.xml class main user root |