summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang zhengguang <zhengguang.zhang@intel.com>2014-07-04 06:49:18 (GMT)
committerZhang zhengguang <zhengguang.zhang@intel.com>2014-10-31 08:06:20 (GMT)
commit85053773dfe482c81ca1ac87dc6baf2ff6b29df0 (patch)
tree9e881513e590f6a72914450c4fdc8b85fadeb574
parent7923d6ca6ccb144a5b036b03a015a182c3622a92 (diff)
downloadconnman-85053773dfe482c81ca1ac87dc6baf2ff6b29df0.zip
connman-85053773dfe482c81ca1ac87dc6baf2ff6b29df0.tar.gz
connman-85053773dfe482c81ca1ac87dc6baf2ff6b29df0.tar.bz2
Set ConnMan default settings in config files
-rw-r--r--src/connman.service.in3
-rw-r--r--src/main.conf4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/connman.service.in b/src/connman.service.in
index 7b6195e..67d051d 100644
--- a/src/connman.service.in
+++ b/src/connman.service.in
@@ -5,10 +5,11 @@ After=dbus.socket
Before=remote-fs.target
[Service]
+EnvironmentFile=-/etc/sysconfig/connman
Type=dbus
BusName=net.connman
Restart=on-failure
-ExecStart=@prefix@/sbin/connmand -n
+ExecStart=@prefix@/sbin/connmand -n $OPTIONS
StandardOutput=null
[Install]
diff --git a/src/main.conf b/src/main.conf
index 93c7a50..c979553 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -19,6 +19,7 @@
# the scan list is empty. In that case, a simple backoff
# mechanism starting from 10s up to 5 minutes will run.
# BackgroundScanning = true
+BackgroundScanning = false
# List of Fallback timeservers separated by ",".
# These timeservers are used for NTP sync when there are
@@ -26,6 +27,7 @@
# These can contain mixed combination of fully qualified
# domain names, IPv4 and IPv6 addresses.
# FallbackTimeservers =
+FallbackTimeservers = pool.ntp.org
# List of fallback nameservers separated by "," used if no
# nameservers are otherwise provided by the service. The
@@ -52,6 +54,7 @@
# the default route when compared to either a non-preferred
# type or a preferred type further down in the list.
# PreferredTechnologies =
+PreferredTechnologies = ethernet,wifi
# List of blacklisted network interfaces separated by ",".
# Found interfaces will be compared to the list and will
@@ -59,6 +62,7 @@
# match any of the list entries. Default value is
# vmnet,vboxnet,virbr,ifb.
# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb
+NetworkInterfaceBlacklist = vmnet,vboxnet,virbr
# Allow connman to change the system hostname. This can
# happen for example if we receive DHCP hostname option.