From b66f632df6e1aef8108c7dd65bd97fd3a33dd292 Mon Sep 17 00:00:00 2001 From: frank Date: Sun, 15 Jan 2012 23:42:05 +0100 Subject: [PATCH] committing changes in /etc after emerge run Package changes: +sys-apps/dbus-1.4.16 --- .etckeeper | 12 ++++ X11/xinit/xinitrc.d/80-dbus | 13 ++++ dbus-1/session.conf | 63 +++++++++++++++++++ dbus-1/session.d/.keep_sys-apps_dbus-0 | 0 dbus-1/system.conf | 83 ++++++++++++++++++++++++++ dbus-1/system.d/.keep_sys-apps_dbus-0 | 0 init.d/dbus | 51 ++++++++++++++++ 7 files changed, 222 insertions(+) create mode 100755 X11/xinit/xinitrc.d/80-dbus create mode 100644 dbus-1/session.conf create mode 100644 dbus-1/session.d/.keep_sys-apps_dbus-0 create mode 100644 dbus-1/system.conf create mode 100644 dbus-1/system.d/.keep_sys-apps_dbus-0 create mode 100755 init.d/dbus diff --git a/.etckeeper b/.etckeeper index d41284b8..28636a40 100755 --- a/.etckeeper +++ b/.etckeeper @@ -11,6 +11,10 @@ maybe chmod 0700 './.etckeeper' maybe chmod 0644 './.gitignore' maybe chmod 0600 './.pwd.lock' maybe chmod 0644 './DIR_COLORS' +maybe chmod 0755 './X11' +maybe chmod 0755 './X11/xinit' +maybe chmod 0755 './X11/xinit/xinitrc.d' +maybe chmod 0755 './X11/xinit/xinitrc.d/80-dbus' maybe chmod 0600 './aiccu.conf' maybe chmod 0755 './bash' maybe chmod 0644 './bash/._cfg0000_bashrc' @@ -75,6 +79,13 @@ maybe chmod 0750 './cron.weekly' maybe chmod 0644 './cron.weekly/.keep_sys-process_cronbase-0' maybe chmod 0644 './crontab' maybe chmod 0644 './csh.env' +maybe chmod 0755 './dbus-1' +maybe chmod 0644 './dbus-1/session.conf' +maybe chmod 0755 './dbus-1/session.d' +maybe chmod 0644 './dbus-1/session.d/.keep_sys-apps_dbus-0' +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 0755 './default' maybe chmod 0600 './default/useradd' maybe chmod 0644 './dhcpcd.conf' @@ -176,6 +187,7 @@ maybe chmod 0755 './init.d/aiccu' maybe chmod 0755 './init.d/bootmisc' maybe chmod 0755 './init.d/consolefont' maybe chmod 0755 './init.d/crypto-loop' +maybe chmod 0755 './init.d/dbus' maybe chmod 0755 './init.d/devfs' maybe chmod 0755 './init.d/device-mapper' maybe chmod 0755 './init.d/dhcpcd' diff --git a/X11/xinit/xinitrc.d/80-dbus b/X11/xinit/xinitrc.d/80-dbus new file mode 100755 index 00000000..5593e2cd --- /dev/null +++ b/X11/xinit/xinitrc.d/80-dbus @@ -0,0 +1,13 @@ +#!/bin/bash + +# launches a session dbus instance + +dbuslaunch="`which dbus-launch 2>/dev/null`" +if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + if [ -n "$command" ]; then + command="$dbuslaunch --exit-with-session $command" + else + eval `$dbuslaunch --sh-syntax --exit-with-session` + fi +fi + diff --git a/dbus-1/session.conf b/dbus-1/session.conf new file mode 100644 index 00000000..dde5ef6b --- /dev/null +++ b/dbus-1/session.conf @@ -0,0 +1,63 @@ + + + + + + session + + + + + unix:tmpdir=/tmp + + + + + + + + + + + + + + session.d + + + session-local.conf + + contexts/dbus_contexts + + + + + 1000000000 + 250000000 + 1000000000 + 250000000 + 1000000000 + 4096 + 120000 + 240000 + 100000 + 10000 + 100000 + 10000 + 50000 + 50000 + 50000 + + diff --git a/dbus-1/session.d/.keep_sys-apps_dbus-0 b/dbus-1/session.d/.keep_sys-apps_dbus-0 new file mode 100644 index 00000000..e69de29b diff --git a/dbus-1/system.conf b/dbus-1/system.conf new file mode 100644 index 00000000..cb5d15f2 --- /dev/null +++ b/dbus-1/system.conf @@ -0,0 +1,83 @@ + + + + + + + + + system + + + messagebus + + + + + + + + + /usr/libexec/dbus-daemon-launch-helper + + + /var/run/dbus.pid + + + + + + EXTERNAL + + + unix:path=/var/run/dbus/system_bus_socket + + + + + + + + + + + + + + + + + + + + + + + + + + + + system.d + + + system-local.conf + + contexts/dbus_contexts + + diff --git a/dbus-1/system.d/.keep_sys-apps_dbus-0 b/dbus-1/system.d/.keep_sys-apps_dbus-0 new file mode 100644 index 00000000..e69de29b diff --git a/init.d/dbus b/init.d/dbus new file mode 100755 index 00000000..502f40fd --- /dev/null +++ b/init.d/dbus @@ -0,0 +1,51 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.5 2011/09/23 12:45:03 polynomial-c Exp $ + +extra_started_commands="reload" + +depend() { + need localmount + after bootmisc +} + +start() { + ebegin "Starting D-BUS system messagebus" + + /usr/bin/dbus-uuidgen --ensure + + # We need to test if /var/run/dbus exists, since script will fail if it does not + [ ! -e /var/run/dbus ] && mkdir /var/run/dbus + + start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system + eend $? +} + +stop() { + local retval + + ebegin "Stopping D-BUS system messagebus" + + start-stop-daemon --stop --pidfile /var/run/dbus.pid + retval=$? + + eend ${retval} + + [ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket + + return ${retval} +} + +reload() { + local retval + + ebegin "Reloading D-BUS messagebus config" + + /usr/bin/dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + retval=$? + eend ${retval} + return ${retval} +} -- 2.39.5