X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmain.conf;h=ab21fd89e2175bae325a65e7695d1a71bb0f3719;hb=7c1ddffb3a7c840f63ac969be5b294971d5c7327;hp=92ec8412b333ffb43dee0a61a2e2d0d9455be975;hpb=920950231d5875220010ed5810593d42b0106dc2;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/src/main.conf b/src/main.conf
index 92ec841..ab21fd8 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -1,5 +1,19 @@
 [General]
 
+# Set input request timeout. Default is 120 seconds
+# The request for inputs like passphrase will timeout
+# after certain amount of time. Use this setting to
+# increase the value in case of different user
+# interface designs.
+InputRequestTimeout = 120
+
+# Set browser launch timeout. Default is 300 seconds
+# The request for launching a browser for portal pages
+# will timeout after certain amount of time. Use this
+# setting to increase the value in case of different
+# user interface designs.
+BrowserLaunchTimeout = 300
+
 # Enable background scanning. Default is true.
 # Background scanning will start every 5 minutes unless
 # the scan list is empty. In that case, a simple backoff
@@ -12,3 +26,34 @@ BackgroundScanning = true
 # These can contain mixed combination of fully qualified
 # domain names, IPv4 and IPv6 addresses.
 # FallbackTimeservers =
+
+# List of fallback nameservers separated by "," appended
+# to the list of nameservers given by the service. The
+# nameserver entries must be in numeric format, host
+# names are ignored.
+# FallbackNameservers =
+
+# List of technologies that are marked autoconnectable
+# by default, separated by commas ",". The default value
+# for this entry when empty is ethernet,wifi,cellular.
+# Services that are automatically connected must have been
+# set up and saved to storage beforehand.
+# DefaultAutoConnectTechnologies =
+
+# List of preferred technologies from the most preferred
+# one to the least preferred one separated by commas ",".
+# Services of the listed technology type will be tried one
+# by one in the order given, until one of them gets connected
+# with state 'online' or they are all tried. A service of a
+# preferred technology type in state 'ready' will get the
+# default route when compared to a non-preferred type; a
+# service of a preferred technology type in state 'online'
+# will get the default route when compared to either a
+# non-preferred type or a preferred type in state 'ready'.
+# PreferredTechnologies =
+
+# List of blacklisted network interfaces separated by ",".
+# 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.
+NetworkInterfaceBlacklist = vmnet,vboxnet,virbr