Fix NTP doesn't work(TZIVI-209)

diff --git a/packaging/connman.changes b/packaging/connman.changes
index 9ebe3d2..70826f6 100644 (file)
--- a/packaging/connman.changes
+++ b/packaging/connman.changes
@@ -1,3 +1,6 @@
+* Tue Wed Aug  1 12:53:47 CST 2012 Chengyi <chengyix.zhao@intel.com> - 1.0
+- NTP doesn't work(fix the bug "TZIVI-209")
+
 * Tue Jul 31 19:01:51 UTC 2012 - tracy.graydon@intel.com
 - TZIVI-276: update connman-test dep from pygobject2 to pygobject 
 

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 940a6b5..e7b9ed7 100644 (file)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -7,6 +7,7 @@ License:    GPLv2
 URL:        http://connman.net/
 Source0:    %{name}-%{version}.tar.bz2
 Source1:    settings
+Source2:    main.conf
 Requires:   dbus
 Requires:   wpa_supplicant >= 0.7.1
 Requires:   bluez
@@ -91,6 +92,9 @@ Scripts for testing Connman and its functionality
 make %{?jobs:-j%jobs}
 
 %install
+mkdir -p %{buildroot}%{_sysconfdir}/connman
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/connman/main.conf
+
 mkdir -p %{buildroot}/usr/lib/systemd/system/network.target.wants
 ln -s ../connman.service %{buildroot}/usr/lib/systemd/system/network.target.wants/connman.service
 
@@ -117,6 +121,7 @@ systemctl daemon-reload
 %{_sbindir}/*
 #%{_libdir}/%{name}/scripts/*
 %config %{_sysconfdir}/dbus-1/system.d/*.conf
+%config %{_sysconfdir}/connman/*.conf
 /usr/lib/systemd/system/connman.service
 /usr/lib/systemd/system/network.target.wants/connman.service
 /var/lib/connman/settings

diff --git a/packaging/main.conf b/packaging/main.conf
new file mode 100644 (file)
index 0000000..a1be8e0
--- /dev/null
+++ b/packaging/main.conf
@@ -0,0 +1,60 @@
+[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
+# mechanism starting from 10s up to 5 minutes will run.
+# BackgroundScanning = true
+
+# List of Fallback timeservers separated by ",".
+# These timeservers are used for NTP sync when there are
+# no timeserver set by the user or by the service.
+# These can contain mixed combination of fully qualified
+# domain names, IPv4 and IPv6 addresses.
+  FallbackTimeservers = ntp.meego.com
+
+# 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. Default value is
+# vmnet,vboxnet,virbr.
+# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr