diff options
author | cheoleun moon <chleun.moon@samsung.com> | 2016-10-11 01:26:38 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-10-11 01:26:38 -0700 |
commit | 8153acb82d4318fbb9b0de572440452242535d6a (patch) | |
tree | ba9de343421d955c3dfef2e375384cead6188884 | |
parent | 164a42b41b8b1ff2c25c2cd81beff80e1d420d51 (diff) | |
parent | 3bc354d272103da56f15ab57181718668d0b1041 (diff) | |
download | connman-8153acb82d4318fbb9b0de572440452242535d6a.tar.gz connman-8153acb82d4318fbb9b0de572440452242535d6a.tar.bz2 connman-8153acb82d4318fbb9b0de572440452242535d6a.zip |
Merge "Spec: Add eth0 device as NetworkInterfaceBlacklist in ivi profile." into tizensubmit/tizen_3.0_common/20161104.104000submit/tizen_3.0/20161028.092423submit/tizen_3.0/20161028.062323submit/tizen/20161011.075122accepted/tizen/wearable/20161011.234313accepted/tizen/tv/20161011.234258accepted/tizen/mobile/20161011.234412accepted/tizen/ivi/20161011.234346accepted/tizen/common/20161011.154420accepted/tizen/3.0/wearable/20161028.150857accepted/tizen/3.0/tv/20161028.143553accepted/tizen/3.0/mobile/20161028.143243accepted/tizen/3.0/ivi/20161028.151403
-rwxr-xr-x | packaging/connman.spec | 5 | ||||
-rwxr-xr-x | src/main_ivi.conf | 110 |
2 files changed, 115 insertions, 0 deletions
diff --git a/packaging/connman.spec b/packaging/connman.spec index 953d5184..b37b1358 100755 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -172,7 +172,12 @@ cp resources/var/lib/connman/settings %{buildroot}/%{_localstatedir}/lib/connman mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services cp resources/usr/share/dbus-1/system-services/net.connman.service %{buildroot}%{_datadir}/dbus-1/system-services/net.connman.service mkdir -p %{buildroot}/etc/connman + +%if "%{profile}" == "ivi" +cp src/main_ivi.conf %{buildroot}/etc/connman/main.conf +%else cp src/main.conf %{buildroot}/etc/connman/main.conf +%endif rm %{buildroot}%{_sysconfdir}/dbus-1/system.d/*.conf mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d/ diff --git a/src/main_ivi.conf b/src/main_ivi.conf new file mode 100755 index 00000000..627bd061 --- /dev/null +++ b/src/main_ivi.conf @@ -0,0 +1,110 @@ +[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 +BackgroundScanning = false + +# 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 = +#FallbackTimeservers = pool.ntp.org + +# List of fallback nameservers separated by "," used if no +# nameservers are otherwise provided 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 +# or they are all tried. A service of a preferred technology +# type in state 'ready' will get the default route when +# compared to another preferred type further down the list +# with state 'ready' or with 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 further down in the list. +# PreferredTechnologies = +PreferredTechnologies = wifi, ethernet + +# 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,ifb. +# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb +NetworkInterfaceBlacklist = veth, vmnet,vboxnet,virbr,usb,rndis,rmnet,rev_rmnet,dummy,seth_td,seth_w,eth0 + +# Allow connman to change the system hostname. This can +# happen for example if we receive DHCP hostname option. +# Default value is true. +# AllowHostnameUpdates = true + +# Keep only a single connected technology at any time. When a new +# service is connected by the user or a better one is found according +# to PreferredTechnologies, the new service is kept connected and all +# the other previously connected services are disconnected. With this +# setting it does not matter whether the previously connected services +# are in 'online' or 'ready' states, the newly connected service is +# the only one that will be kept connected. A service connected by the +# user will be used until going out of network coverage. With this +# setting enabled applications will notice more network breaks than +# normal. Default value is false. +# SingleConnectedTechnology = false +SingleConnectedTechnology = true + +# List of technologies for which tethering is allowed separated by ",". +# The default value is wifi,bluetooth,gadget. Only those technologies +# listed here are used for tethering. If ethernet tethering is desired, +# then ethernet should be added to the list. The technologies listed here +# have to support tethering, currently tethering is implemented for wifi, +# bluetooth, gadget and ethernet. +# NOTE that if ethernet tethering is enabled, then a DHCP server is +# started on all ethernet interfaces. Tethered ethernet should +# never be connected to corporate or home network as it will disrupt +# 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 + +# Restore earlier tethering status when returning from offline mode, +# re-enabling a technology, and after restarts and reboots. +# Default value is false. +# PersistentTetheringMode = false + +# Automatically enable Anycast 6to4 if possible. This is not recommended, as +# the use of 6to4 will generally lead to a severe degradation of connection +# quality. See RFC6343. Default value is false (as recommended by RFC6343 +# section 4.1). +# Enable6to4 = false + +NetworkCellularInterfaceList = pdp,rmnet,seth_td,seth_w |