projects
/
framework
/
connectivity
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
fb8105e
)
main.conf: Comment out example default values and add documentation
author
Patrik Flykt
<patrik.flykt@linux.intel.com>
Mon, 25 Jun 2012 06:24:15 +0000
(09:24 +0300)
committer
Patrik Flykt
<patrik.flykt@linux.intel.com>
Mon, 25 Jun 2012 06:34:01 +0000
(09:34 +0300)
src/main.conf
patch
|
blob
|
history
diff --git
a/src/main.conf
b/src/main.conf
index
ab21fd8
..
95fc7d4
100644
(file)
--- a/
src/main.conf
+++ b/
src/main.conf
@@
-5,20
+5,20
@@
# after certain amount of time. Use this setting to
# increase the value in case of different user
# interface designs.
# after certain amount of time. Use this setting to
# increase the value in case of different user
# interface designs.
-InputRequestTimeout = 120
+
#
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.
# 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
+
#
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
# mechanism starting from 10s up to 5 minutes will run.
# 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
# mechanism starting from 10s up to 5 minutes will run.
-BackgroundScanning = true
+
#
BackgroundScanning = true
# List of Fallback timeservers separated by ",".
# These timeservers are used for NTP sync when there are
# List of Fallback timeservers separated by ",".
# These timeservers are used for NTP sync when there are
@@
-55,5
+55,6
@@
BackgroundScanning = true
# 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
# 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
+# match any of the list entries. Default value is
+# vmnet,vboxnet,virbr.
+# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr