From: frank Date: Mon, 16 Jan 2012 06:45:19 +0000 (+0100) Subject: committing changes in /etc after emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=bb70d869dcef3c6788ac85fd6da1ee51f44d11b5;p=config%2Fbruni%2Fetc.git committing changes in /etc after emerge run Package changes: +net-wireless/bluez-4.96 --- diff --git a/.etckeeper b/.etckeeper index 04e4e846..49890a7e 100755 --- a/.etckeeper +++ b/.etckeeper @@ -38,6 +38,13 @@ maybe chmod 0755 './bash' maybe chmod 0644 './bash/bash_logout' maybe chmod 0644 './bash/bashrc' maybe chmod 0755 './bash_completion.d' +maybe chmod 0755 './bluetooth' +maybe chmod 0644 './bluetooth/audio.conf' +maybe chmod 0644 './bluetooth/input.conf' +maybe chmod 0644 './bluetooth/main.conf' +maybe chmod 0644 './bluetooth/network.conf' +maybe chmod 0644 './bluetooth/rfcomm.conf' +maybe chmod 0644 './bluetooth/serial.conf' maybe chmod 0755 './bonobo-activation' maybe chmod 0644 './bonobo-activation/bonobo-activation-config.xml' maybe chmod 0755 './ca-certificates' @@ -47,6 +54,7 @@ maybe chmod 0644 './colordiffrc' maybe chmod 0644 './colordiffrc-lightbg' maybe chmod 0755 './conf.d' maybe chmod 0644 './conf.d/._cfg0000_ntpd' +maybe chmod 0644 './conf.d/bluetooth' maybe chmod 0644 './conf.d/bootmisc' maybe chmod 0644 './conf.d/consolefont' maybe chmod 0644 './conf.d/crypto-loop' @@ -136,6 +144,7 @@ maybe chmod 0644 './dbus-1/system.conf' maybe chmod 0755 './dbus-1/system.d' maybe chmod 0644 './dbus-1/system.d/.keep_sys-apps_dbus-0' maybe chmod 0644 './dbus-1/system.d/ConsoleKit.conf' +maybe chmod 0644 './dbus-1/system.d/bluetooth.conf' maybe chmod 0444 './dbus-1/system.d/cups.conf' maybe chmod 0644 './dbus-1/system.d/org.freedesktop.PolicyKit1.conf' maybe chmod 0644 './dbus-1/system.d/org.gnome.GConf.Defaults.conf' @@ -322,6 +331,7 @@ maybe chmod 0644 './host.conf' maybe chmod 0644 './hosts' maybe chmod 0755 './init.d' maybe chmod 0755 './init.d/aiccu' +maybe chmod 0755 './init.d/bluetooth' maybe chmod 0755 './init.d/bootmisc' maybe chmod 0755 './init.d/consolefont' maybe chmod 0755 './init.d/consolekit' diff --git a/bluetooth/audio.conf b/bluetooth/audio.conf new file mode 100644 index 00000000..302e0460 --- /dev/null +++ b/bluetooth/audio.conf @@ -0,0 +1,45 @@ +# Configuration file for the audio service + +# This section contains options which are not specific to any +# particular interface +[General] + +# Switch to master role for incoming connections (defaults to true) +#Master=true + +# If we want to disable support for specific services +# Defaults to supporting all implemented services +#Disable=Control,Source + +# SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA) +# Defaults to HCI +#SCORouting=PCM + +# Automatically connect both A2DP and HFP/HSP profiles for incoming +# connections. Some headsets that support both profiles will only connect the +# other one automatically so the default setting of true is usually a good +# idea. +#AutoConnect=true + +# Headset interface specific options (i.e. options which affect how the audio +# service interacts with remote headset devices) +[Headset] + +# Set to true to support HFP, false means only HSP is supported +# Defaults to true +HFP=true + +# Maximum number of connected HSP/HFP devices per adapter. Defaults to 1 +MaxConnected=1 + +# Set to true to enable use of fast connectable mode (faster page scanning) +# for HFP when incomming call starts. Default settings are restored after +# call is answered or rejected. Page scan interval is much shorter and page +# scan type changed to interlaced. Such allows faster connection initiated +# by a headset. +FastConnectable=false + +# Just an example of potential config options for the other interfaces +#[A2DP] +#SBCSources=1 +#MPEG12Sources=0 diff --git a/bluetooth/input.conf b/bluetooth/input.conf new file mode 100644 index 00000000..abfb64f2 --- /dev/null +++ b/bluetooth/input.conf @@ -0,0 +1,9 @@ +# Configuration file for the input service + +# This section contains options which are not specific to any +# particular interface +[General] + +# Set idle timeout (in minutes) before the connection will +# be disconnect (defaults to 0 for no timeout) +#IdleTimeout=30 diff --git a/bluetooth/main.conf b/bluetooth/main.conf new file mode 100644 index 00000000..8cd132fe --- /dev/null +++ b/bluetooth/main.conf @@ -0,0 +1,66 @@ +[General] + +# List of plugins that should not be loaded on bluetoothd startup +#DisablePlugins = network,input + +# Default adaper name +# %h - substituted for hostname +# %d - substituted for adapter id +Name = %h-%d + +# Default device class. Only the major and minor device class bits are +# considered. +Class = 0x000100 + +# How long to stay in discoverable mode before going back to non-discoverable +# The value is in seconds. Default is 180, i.e. 3 minutes. +# 0 = disable timer, i.e. stay discoverable forever +DiscoverableTimeout = 0 + +# How long to stay in pairable mode before going back to non-discoverable +# The value is in seconds. Default is 0. +# 0 = disable timer, i.e. stay pairable forever +PairableTimeout = 0 + +# Use some other page timeout than the controller default one +# which is 16384 (10 seconds). +PageTimeout = 8192 + +# Discover scheduler interval used in Adapter.DiscoverDevices +# The value is in seconds. Defaults is 30. +DiscoverSchedulerInterval = 30 + +# What value should be assumed for the adapter Powered property when +# SetProperty(Powered, ...) hasn't been called yet. Defaults to true +InitiallyPowered = true + +# Remember the previously stored Powered state when initializing adapters +RememberPowered = true + +# Use vendor, product and version information for DID profile support. +# The values are separated by ":" and VID, PID and version. +#DeviceID = 1234:5678:abcd + +# Do reverse service discovery for previously unknown devices that connect to +# us. This option is really only needed for qualification since the BITE tester +# doesn't like us doing reverse SDP for some test cases (though there could in +# theory be other useful purposes for this too). Defaults to true. +ReverseServiceDiscovery = true + +# Enable name resolving after inquiry. Set it to 'false' if you don't need +# remote devices name and want shorter discovery cycle. Defaults to 'true'. +NameResolving = true + +# Enable runtime persistency of debug link keys. Default is false which +# makes debug link keys valid only for the duration of the connection +# that they were created for. +DebugKeys = false + +# Enable Low Energy support if the dongle supports. Default is false. +# Enable/Disable interleave discovery and attribute server over LE. +EnableLE = false + +# Enable the GATT Attribute Server. Default is false, because it is only +# useful for testing. Attribute server is not enabled over LE if EnableLE +# is false. +AttributeServer = false diff --git a/bluetooth/network.conf b/bluetooth/network.conf new file mode 100644 index 00000000..5f116395 --- /dev/null +++ b/bluetooth/network.conf @@ -0,0 +1,6 @@ +# Configuration file for the network service + +[General] + +# Disable link encryption: default=false +#DisableSecurity=true diff --git a/bluetooth/rfcomm.conf b/bluetooth/rfcomm.conf new file mode 100644 index 00000000..6179ef7b --- /dev/null +++ b/bluetooth/rfcomm.conf @@ -0,0 +1,17 @@ +# +# RFCOMM configuration file. +# + +#rfcomm0 { +# # Automatically bind the device at startup +# bind no; +# +# # Bluetooth address of the device +# device 11:22:33:44:55:66; +# +# # RFCOMM channel for the connection +# channel 1; +# +# # Description of the connection +# comment "Example Bluetooth device"; +#} diff --git a/bluetooth/serial.conf b/bluetooth/serial.conf new file mode 100644 index 00000000..43ee6af9 --- /dev/null +++ b/bluetooth/serial.conf @@ -0,0 +1,10 @@ +# Configuration file for serial + +# There could be multiple proxy sections, the format is [Proxy ] +#[Proxy DUN] + +# UUID for DUN proxy service +#UUID=00001103-0000-1000-8000-00805F9B34FB + +# Address for device node +#Address=/dev/ttyx diff --git a/conf.d/bluetooth b/conf.d/bluetooth new file mode 100644 index 00000000..b0cc7444 --- /dev/null +++ b/conf.d/bluetooth @@ -0,0 +1,7 @@ +# Bluetooth configuraton file + +# Bind rfcomm devices (allowed values are "true" and "false") +RFCOMM_ENABLE=true + +# Config file for rfcomm +RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" diff --git a/dbus-1/system.d/bluetooth.conf b/dbus-1/system.d/bluetooth.conf new file mode 100644 index 00000000..853f9268 --- /dev/null +++ b/dbus-1/system.d/bluetooth.conf @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/init.d/bluetooth b/init.d/bluetooth new file mode 100755 index 00000000..6339f99c --- /dev/null +++ b/init.d/bluetooth @@ -0,0 +1,33 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d,v 1.2 2011/03/20 16:57:35 pacho Exp $ + +depend() { + after coldplug + need dbus localmount hostname +} + +start() { + ebegin "Starting Bluetooth" + + udevadm trigger --subsystem-match=bluetooth --action=add + eend $? + + if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then + if [ -f "${RFCOMM_CONFIG}" ]; then + eindent + ebegin "Starting rfcomm" + /usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all + eoutdent + eend $? + else + ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists" + fi + fi +} + +stop() { + ebegin "Shutting down Bluetooth" + eend 0 +}