diff options
| author | Christopher Grant <cjgrant@google.com> | 2016-01-19 23:13:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-19 23:13:01 +0000 |
| commit | 9c420eb7bc3a0ae5fe61a02029d8460e89f69c23 (patch) | |
| tree | 40a05762d48665129036a5aa605c4c1911368e0d | |
| parent | f2f3ebabbd6fda436cc96fecd581827e96b78f36 (diff) | |
| parent | 5912d505fc9b4cf9d7b22385919a67653e81d551 (diff) | |
| download | shill-9c420eb7bc3a0ae5fe61a02029d8460e89f69c23.tar.gz | |
shill: include ignore-unknown-ethernet argument in shill.conf
am: 5912d505fc
* commit '5912d505fc9b4cf9d7b22385919a67653e81d551':
shill: include ignore-unknown-ethernet argument in shill.conf
| -rw-r--r-- | init/shill.conf.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/init/shill.conf.in b/init/shill.conf.in index 553219c1..bcba0789 100644 --- a/init/shill.conf.in +++ b/init/shill.conf.in @@ -38,6 +38,7 @@ env SHILL_ACCEPT_HOSTNAME_FROM= env SHILL_MINIMUM_MTU= env BLACKLISTED_DEVICES= env DHCPV6_ENABLED_DEVICES= +env IGNORE_UNKNOWN_ETHERNET= # Hook for mod_for_test_scripts/100setupTestingInterface. env SHILL_TEST_DEVICES="" @@ -98,6 +99,9 @@ script if [ -n "${DHCPV6_ENABLED_DEVICES}" ]; then ARGS="${ARGS} --dhcpv6-enabled-devices=${DHCPV6_ENABLED_DEVICES}" fi + if [ -n "${IGNORE_UNKNOWN_ETHERNET}" ]; then + ARGS="${ARGS} --ignore-unknown-ethernet" + fi ARGS="${ARGS} ${SHILL_TEST_ARGS}" # If OOBE has not completed (i.e. EULA not agreed to), do not run |