diff options
| author | Samuel Tan <samueltan@google.com> | 2015-09-30 13:01:42 -0700 |
|---|---|---|
| committer | Samuel Tan <samueltan@google.com> | 2015-09-30 16:34:38 -0700 |
| commit | 14596ac959f09d8824dc2ee9a3b20ad7fe3de068 (patch) | |
| tree | 370f05ffc6f8a2ae73915548198dbed57f36d1cf | |
| parent | c869152aede5051996d60c2b843b74630970c2f8 (diff) | |
| download | dhcpcd-6.8.2-14596ac959f09d8824dc2ee9a3b20ad7fe3de068.tar.gz | |
dhcpcd-6.8.2: update dhcpcd configuration
Update android.conf with the configuration options used
by dhcpcd in Chrome OS. This allows dhcpcd to behave
correctly during shill's configuration process.
While there, move the -DPASSIVE_MODE flag to the
LOCAL_CFLAGS variable, since it was previously not
being used in LOCAL_CPPFLAGS (dhcpcd-6.8.2 is written
entirely in C).
BUG: 24372451
Change-Id: I3cf5e8f685f57c04994a57ddfb960531c7821b04
| -rw-r--r-- | Android.mk | 3 | ||||
| -rwxr-xr-x | android.conf | 22 |
2 files changed, 22 insertions, 3 deletions
@@ -56,8 +56,7 @@ endif ifeq ($(DHCPCD_USE_DBUS), yes) LOCAL_SRC_FILES += dbus/dbus-dict.c dbus/rpc-dbus.c -LOCAL_CPPFLAGS += -DPASSIVE_MODE -LOCAL_CFLAGS += -DCONFIG_DBUS +LOCAL_CFLAGS += -DCONFIG_DBUS -DPASSIVE_MODE LOCAL_SHARED_LIBRARIES += libdbus else LOCAL_SRC_FILES += rpc-stub.c diff --git a/android.conf b/android.conf index 8cbbea0..79ae06b 100755 --- a/android.conf +++ b/android.conf @@ -1,4 +1,24 @@ # dhcpcd-6.8.2 configuration for Android Wi-Fi interface # See dhcpcd.conf(5) for details. -interface wlan0 +# disable ARP checking +noarp +# no link state monitoring +nolink + +# Inform the DHCP server of our hostname for DDNS. +hostname +# To share the DHCP lease across OSX and Windows a ClientID is needed. +# Enabling this may get a different lease than the kernel DHCP client. +# Some upstream DHCP servers may also require a ClientID, such as FRITZ!Box. +clientid + +# A list of options to request from the DHCP server. +option domain_name_servers, domain_name, domain_search, host_name, wpad_url +option classless_static_routes +# Most distributions have NTP support. +#option ntp_servers +# Respect the network MTU. +option interface_mtu +# A ServerID is required by RFC2131. +require dhcp_server_identifier |