diff options
| author | 2018-05-31 11:33:20 -0700 | |
|---|---|---|
| committer | 2018-05-31 11:33:20 -0700 | |
| commit | d400338c6b54abbe6e90dab656c8d36fe2a5917f (patch) | |
| tree | 22defdc3265d8d5f4829b0bd23ef12e734d74131 | |
| parent | 4edb110569c329e0565b5ca458c06b723911c683 (diff) | |
| parent | 44f714708421ce91c50f469b13bb31e4dea7c8cf (diff) | |
Merge "Fix comments to reflect changes in eth service" into pi-dev
am: 44f7147084
Change-Id: I4a99fdf5879779165b9360f67325421bc0efd71e
| -rw-r--r-- | core/res/res/values/config.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index c856ed81d575..95e5ac8ca331 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -377,12 +377,14 @@ [Network Capabilities] Optional. A comma seprated list of network capabilities. Values must be from NetworkCapabilities#NET_CAPABILITIES_* constants. [IP config] Optional. If empty or not specified - DHCP will be used, otherwise - static IP address with the mask. + use the following format to specify static IP configuration: + ip=<ip-address/mask> gateway=<ip-address> dns=<comma-sep-ip-addresses> + domains=<comma-sep-domains> --> <string-array translatable="false" name="config_ethernet_interfaces"> <!-- - <item>eth1;12,13,14,15;192.168.0.10/24</item> - <item>eth2;;192.168.0.11/24</item> + <item>eth1;12,13,14,15;ip=192.168.0.10/24 gateway=192.168.0.1 dns=4.4.4.4,8.8.8.8</item> + <item>eth2;;ip=192.168.0.11/24</item> --> </string-array> |