From 23cd0f4068a11cc073a26021267440e013149693 Mon Sep 17 00:00:00 2001 From: Joshua Dye Date: Mon, 10 Sep 2018 13:28:37 -0400 Subject: [PATCH] committing changes in /etc after apt run Package changes: +connman 1.36-1 armhf --- .etckeeper | 6 + apport/crashdb.conf.d/connman-crashdb.conf | 5 + connman/main.conf | 134 ++++++++++++++++++ init.d/connman | 78 ++++++++++ rc0.d/K01connman | 1 + rc1.d/K01connman | 1 + rc2.d/S01connman | 1 + rc3.d/S01connman | 1 + rc4.d/S01connman | 1 + rc5.d/S01connman | 1 + rc6.d/K01connman | 1 + systemd/system/dundee.service | 1 - .../multi-user.target.wants/connman.service | 1 + .../connman-wait-online.service | 1 + systemd/system/ofono.service | 1 - 15 files changed, 232 insertions(+), 2 deletions(-) create mode 100644 apport/crashdb.conf.d/connman-crashdb.conf create mode 100644 connman/main.conf create mode 100755 init.d/connman create mode 120000 rc0.d/K01connman create mode 120000 rc1.d/K01connman create mode 120000 rc2.d/S01connman create mode 120000 rc3.d/S01connman create mode 120000 rc4.d/S01connman create mode 120000 rc5.d/S01connman create mode 120000 rc6.d/K01connman delete mode 120000 systemd/system/dundee.service create mode 120000 systemd/system/multi-user.target.wants/connman.service create mode 120000 systemd/system/network-online.target.wants/connman-wait-online.service delete mode 120000 systemd/system/ofono.service diff --git a/.etckeeper b/.etckeeper index b8ba7ccd..73eeb9f4 100755 --- a/.etckeeper +++ b/.etckeeper @@ -98,6 +98,9 @@ maybe chmod 0644 'apparmor.d/local/usr.bin.man' maybe chmod 0644 'apparmor.d/local/usr.sbin.named' maybe chmod 0644 'apparmor.d/usr.bin.man' maybe chmod 0644 'apparmor.d/usr.sbin.named' +maybe chmod 0755 'apport' +maybe chmod 0755 'apport/crashdb.conf.d' +maybe chmod 0644 'apport/crashdb.conf.d/connman-crashdb.conf' maybe chmod 0755 'apt' maybe chmod 0755 'apt/apt.conf.d' maybe chmod 0644 'apt/apt.conf.d/01autoremove' @@ -172,6 +175,8 @@ maybe chmod 0644 'chromium.d/apikeys' maybe chmod 0644 'chromium.d/default-flags' maybe chmod 0644 'chromium.d/extensions' maybe chmod 0755 'cifs-utils' +maybe chmod 0755 'connman' +maybe chmod 0644 'connman/main.conf' maybe chmod 0755 'console-setup' maybe chmod 0644 'console-setup/cached_Lat15-Fixed16.psf.gz' maybe chmod 0644 'console-setup/cached_UTF-8_del.kmap.gz' @@ -743,6 +748,7 @@ maybe chmod 0755 'init.d/alsa-utils' maybe chmod 0755 'init.d/avahi-daemon' maybe chmod 0755 'init.d/bind9' maybe chmod 0755 'init.d/bluetooth' +maybe chmod 0755 'init.d/connman' maybe chmod 0755 'init.d/console-setup.sh' maybe chmod 0755 'init.d/cron' maybe chmod 0755 'init.d/dbus' diff --git a/apport/crashdb.conf.d/connman-crashdb.conf b/apport/crashdb.conf.d/connman-crashdb.conf new file mode 100644 index 00000000..744fae31 --- /dev/null +++ b/apport/crashdb.conf.d/connman-crashdb.conf @@ -0,0 +1,5 @@ +connman = { + 'impl' : 'launchpad', + 'project' : 'connman', + 'bug_pattern_url' : None, + } diff --git a/connman/main.conf b/connman/main.conf new file mode 100644 index 00000000..44db1cc1 --- /dev/null +++ b/connman/main.conf @@ -0,0 +1,134 @@ +[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 + +# If wifi is disconnected, the background scanning will follow a simple +# backoff mechanism from 3s up to 5 minutes. Then, it will stay in 5 +# minutes unless user specifically asks for scanning through a D-Bus +# call. If so, the mechanism will start again from 3s. This feature +# activates also the background scanning while being connected, which +# is required for roaming on wifi. +# When BackgroundScanning is false, ConnMan will not perform any scan +# regardless of wifi is connected or not, unless it is requested by +# the user through a D-Bus call. +# 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 = + +# 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 = + +# 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,ve-,vb-. +# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,ve-,vb- + +# Allow connman to change the system hostname. This can +# happen for example if we receive DHCP hostname option. +# Default value is true. +# AllowHostnameUpdates = true + +# Allow connman to change the system domainname. This can +# happen for example if we receive DHCP domainname option. +# Default value is true. +# AllowDomainnameUpdates = 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 + +# 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 + +# Enable use of http get as on online status check. +# When a service is in a READY state, and is selected as default, +# ConnMan will issue an HTTP GET request to verify that end-to-end +# connectivity is successful. Only then the service will be +# transitioned to ONLINE state. +# If this setting is false, the default service will remain in READY state. +# Default value is true. +# EnableOnlineCheck = false + +# List of technologies with AutoConnect = true which are always connected +# regardless of PreferredTechnologies setting. Default value is empty and +# will connect a technology only if it is at a higher preference than any +# other which is already connected. +# This setting has no effect if SingleConnectedTechnologies is enabled. +# AlwaysConnectedTechnologies = + +# Enable auto connection of services in roaming. +# If this setting is false, roaming services are not auto-connected by Connman. +# Default value is false. +# AutoConnectRoamingServices = false diff --git a/init.d/connman b/init.d/connman new file mode 100755 index 00000000..3ba65be2 --- /dev/null +++ b/init.d/connman @@ -0,0 +1,78 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: connman +# Required-Start: $remote_fs $syslog dbus +# Required-Stop: $remote_fs $syslog dbus +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Connection Manager +### END INIT INFO + + +DAEMON=/usr/sbin/connmand +DESC="Connection Manager" +NAME=connmand +. /lib/lsb/init-functions + +if [ -f /etc/default/connman ] ; then + . /etc/default/connman +fi + +if [ "CONNMAN_RUNSTATEDIR_RESOLVCONF" != "no" ] ; then + mkdir -p /run/connman + ln -sf /run/connman/resolv.conf /etc/ +fi + +do_start() { + start-stop-daemon --start --oknodo --exec $DAEMON -- $DAEMON_OPTS +} + +do_stop() { + start-stop-daemon --stop --oknodo --quiet --exec $DAEMON +} + +get_pid() { + [ -n "$1" ] || return 0 + [ -S /run/dbus/system_bus_socket ] || return 0 + + dbus-send --system --dest=org.freedesktop.DBus --print-reply \ + /org/freedesktop/DBus org.freedesktop.DBus.GetConnectionUnixProcessID \ + string:$1 2>/dev/null | awk '/uint32/ {print $2}' +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" + do_start + log_end_msg $? + ;; + stop) + log_daemon_msg "Stopping $DESC" + do_stop + log_end_msg $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" + do_stop + sleep 1 + do_start + log_end_msg $? + ;; + status) + pid=$(get_pid net.connman) + if [ -n "$pid" ]; then + log_success_msg "$NAME is running" + return 0 + else + log_failure_msg "$NAME is not running" + return 3 # LSB exit code for "program is not running" + fi + ;; + *) + log_success_msg "Usage: $0 {start|stop|status|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/rc0.d/K01connman b/rc0.d/K01connman new file mode 120000 index 00000000..4f178b35 --- /dev/null +++ b/rc0.d/K01connman @@ -0,0 +1 @@ +../init.d/connman \ No newline at end of file diff --git a/rc1.d/K01connman b/rc1.d/K01connman new file mode 120000 index 00000000..4f178b35 --- /dev/null +++ b/rc1.d/K01connman @@ -0,0 +1 @@ +../init.d/connman \ No newline at end of file diff --git a/rc2.d/S01connman b/rc2.d/S01connman new file mode 120000 index 00000000..4f178b35 --- /dev/null +++ b/rc2.d/S01connman @@ -0,0 +1 @@ +../init.d/connman \ No newline at end of file diff --git a/rc3.d/S01connman b/rc3.d/S01connman new file mode 120000 index 00000000..4f178b35 --- /dev/null +++ b/rc3.d/S01connman @@ -0,0 +1 @@ +../init.d/connman \ No newline at end of file diff --git a/rc4.d/S01connman b/rc4.d/S01connman new file mode 120000 index 00000000..4f178b35 --- /dev/null +++ b/rc4.d/S01connman @@ -0,0 +1 @@ +../init.d/connman \ No newline at end of file diff --git a/rc5.d/S01connman b/rc5.d/S01connman new file mode 120000 index 00000000..4f178b35 --- /dev/null +++ b/rc5.d/S01connman @@ -0,0 +1 @@ +../init.d/connman \ No newline at end of file diff --git a/rc6.d/K01connman b/rc6.d/K01connman new file mode 120000 index 00000000..4f178b35 --- /dev/null +++ b/rc6.d/K01connman @@ -0,0 +1 @@ +../init.d/connman \ No newline at end of file diff --git a/systemd/system/dundee.service b/systemd/system/dundee.service deleted file mode 120000 index dc1dc0cd..00000000 --- a/systemd/system/dundee.service +++ /dev/null @@ -1 +0,0 @@ -/dev/null \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/connman.service b/systemd/system/multi-user.target.wants/connman.service new file mode 120000 index 00000000..afe7afc8 --- /dev/null +++ b/systemd/system/multi-user.target.wants/connman.service @@ -0,0 +1 @@ +/lib/systemd/system/connman.service \ No newline at end of file diff --git a/systemd/system/network-online.target.wants/connman-wait-online.service b/systemd/system/network-online.target.wants/connman-wait-online.service new file mode 120000 index 00000000..aa3fa2ea --- /dev/null +++ b/systemd/system/network-online.target.wants/connman-wait-online.service @@ -0,0 +1 @@ +/lib/systemd/system/connman-wait-online.service \ No newline at end of file diff --git a/systemd/system/ofono.service b/systemd/system/ofono.service deleted file mode 120000 index dc1dc0cd..00000000 --- a/systemd/system/ofono.service +++ /dev/null @@ -1 +0,0 @@ -/dev/null \ No newline at end of file