Imported Upstream version 1.35

[platform/upstream/connman.git] / src / main.conf

diff --git a/src/main.conf b/src/main.conf
index a034d33..68870b2 100644 (file)
--- 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,ve-,vb-.
+# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,ve-,vb-
 
 # Allow connman to change the system hostname. This can
 # happen for example if we receive DHCP hostname option.
@@ -77,14 +77,43 @@
 # normal. Default value is false.
 # SingleConnectedTechnology = false
 
-# List of technologies that are allowed to enable tethering separated by ",".
-# The default value is wifi,bluetooth,gadget. Only those technologies listed
-# here are used for tethering. If one wants to tether ethernet,
-# then add "ethernet" in the list.
+# List of technologies for which tethering is allowed separated by ",".
+# The default value is wifi,bluetooth,gadget. Only those technologies
+# listed here are used for tethering. If ethernet tethering is desired,
+# then ethernet should be added to the list. The technologies listed here
+# have to support tethering, currently tethering is implemented for wifi,
+# bluetooth, gadget and ethernet.
 # NOTE that if ethernet tethering is enabled, then a DHCP server is
 # started on all ethernet interfaces. Tethered ethernet should
 # never be connected to corporate or home network as it will disrupt
 # normal operation of these networks. Due to this ethernet is not
 # tethered by default. Do not activate ethernet tethering unless you
 # really know what you are doing.
-# AllowedTetheringTechnologies = wifi,bluetooth,gadget
+# TetheringTechnologies = wifi,bluetooth,gadget
+
+# Restore earlier tethering status when returning from offline mode,
+# re-enabling a technology, and after restarts and reboots.
+# Default value is false.
+# PersistentTetheringMode = false
+
+# Automatically enable Anycast 6to4 if possible. This is not recommended, as
+# the use of 6to4 will generally lead to a severe degradation of connection
+# quality. See RFC6343. Default value is false (as recommended by RFC6343
+# section 4.1).
+# Enable6to4 = false
+
+# Enable use of http get as on online status check.
+# When a service is in a READY state, and is selected as default,
+# ConnMan will issue an HTTP GET request to verify that end-to-end
+# connectivity is successful. Only then the service will be
+# transitioned to ONLINE state.
+# If this setting is false, the default service will remain in READY state.
+# Default value is true.
+# EnableOnlineCheck = false
+
+# List of technologies with AutoConnect = true which are always connected
+# regardless of PreferredTechnologies setting. Default value is empty and
+# will connect a technology only if it is at a higher preference than any
+# other which is already connected.
+# This setting has no effect if SingleConnectedTechnologies is enabled.
+# AlwaysConnectedTechnologies =