projects
/
platform
/
upstream
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.24
[platform/upstream/connman.git]
/
src
/
main.conf
diff --git
a/src/main.conf
b/src/main.conf
index
b8b3239
..
93c7a50
100644
(file)
--- a/
src/main.conf
+++ b/
src/main.conf
@@
-27,8
+27,8
@@
# domain names, IPv4 and IPv6 addresses.
# FallbackTimeservers =
# 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 =
# 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
# 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.
# Allow connman to change the system hostname. This can
# happen for example if we receive DHCP hostname option.