summaryrefslogtreecommitdiff
path: root/src/main.conf
diff options
context:
space:
mode:
authorZhang zhengguang <zhengguang.zhang@intel.com>2014-07-17 02:37:39 (GMT)
committerZhang zhengguang <zhengguang.zhang@intel.com>2014-07-17 02:37:39 (GMT)
commit1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7 (patch)
tree6e991827d28537f7f40f20786c2354fd04a9fdad /src/main.conf
parentfbe905ab58ecc31fe64c410c5f580cadc30e7f04 (diff)
downloadconnman-upstream/1.24.zip
connman-upstream/1.24.tar.gz
connman-upstream/1.24.tar.bz2
Imported Upstream version 1.24upstream/1.24
Diffstat (limited to 'src/main.conf')
-rw-r--r--src/main.conf8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.conf b/src/main.conf
index b8b3239..93c7a50 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -27,8 +27,8 @@
# domain names, IPv4 and IPv6 addresses.
# FallbackTimeservers =
-# List of fallback nameservers separated by "," appended
-# to the list of nameservers given by the service. The
+# List of fallback nameservers separated by "," used if no
+# nameservers are otherwise provided by the service. The
# nameserver entries must be in numeric format, host
# names are ignored.
# FallbackNameservers =
@@ -57,8 +57,8 @@
# Found interfaces will be compared to the list and will
# not be handled by connman, if their first characters
# match any of the list entries. Default value is
-# vmnet,vboxnet,virbr.
-# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr
+# vmnet,vboxnet,virbr,ifb.
+# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb
# Allow connman to change the system hostname. This can
# happen for example if we receive DHCP hostname option.