summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZhang zhengguang <zhengguang.zhang@intel.com>2013-06-26 13:09:22 +0800
committerZhang zhengguang <zhengguang.zhang@intel.com>2013-08-05 13:16:44 +0800
commit6f8eff092409c87722f8447f5157a42c6b750b08 (patch)
treeed5cbad9e8df99db2610125918480442040285dd /src
parent3b36a77dee59a11d7b6b0ba2a38e284aa64daba3 (diff)
downloadconnman-6f8eff092409c87722f8447f5157a42c6b750b08.tar.gz
connman-6f8eff092409c87722f8447f5157a42c6b750b08.tar.bz2
connman-6f8eff092409c87722f8447f5157a42c6b750b08.zip
Add build and configure filesubmit/tizen/20130805.055949
Diffstat (limited to 'src')
-rw-r--r--src/connman.service.in3
-rw-r--r--src/main.conf6
2 files changed, 7 insertions, 2 deletions
diff --git a/src/connman.service.in b/src/connman.service.in
index 2e9e4d53..b35815af 100644
--- a/src/connman.service.in
+++ b/src/connman.service.in
@@ -3,10 +3,11 @@ Description=Connection service
After=syslog.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 e4748fa5..981ad9c3 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 "," appended
# to the list of nameservers given 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.
# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr
+NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,usb
# Allow connman to change the system hostname. This can
# happen for example if we receive DHCP hostname option.
@@ -89,7 +93,7 @@
# 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.
- TetheringTechnologies = 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.