From e5efee2bf239ae600ba61b0f26b0578e1ab239eb Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 11 Mar 2016 16:17:29 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- dbus-1/session.conf | 80 +++++++-------------------------- dbus-1/system.conf | 106 +++++++------------------------------------- init.d/dbus | 43 +++++++----------- 3 files changed, 49 insertions(+), 180 deletions(-) diff --git a/dbus-1/session.conf b/dbus-1/session.conf index 5d93be71..ebb2c511 100644 --- a/dbus-1/session.conf +++ b/dbus-1/session.conf @@ -1,65 +1,19 @@ - - + - - - session - - - - - unix:tmpdir=/tmp - - - - - - - - - - - - - - session.d - - - session-local.conf - - contexts/dbus_contexts - - - - - 1000000000 - 250000000 - 1000000000 - 250000000 - 1000000000 - - 120000 - 240000 - 150000 - 100000 - 10000 - 100000 - 10000 - 50000 - 50000 - 50000 - - + diff --git a/dbus-1/system.conf b/dbus-1/system.conf index 0d22e67b..ec197763 100644 --- a/dbus-1/system.conf +++ b/dbus-1/system.conf @@ -1,91 +1,19 @@ - - - - + - - - - 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/init.d/dbus b/init.d/dbus index 65271f69..977dfffb 100755 --- a/init.d/dbus +++ b/init.d/dbus @@ -1,50 +1,37 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +#!/sbin/openrc-run +# Copyright 1999-2016 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.initd,v 1.1 2011/11/05 13:56:10 ssuominen Exp $ +# $Id$ extra_started_commands="reload" +description="An IPC message bus daemon" +pidfile="/var/run/dbus.pid" +command="/usr/bin/dbus-daemon" +command_args="--system" + +dbus_socket="/var/run/dbus/system_bus_socket" + depend() { need localmount after bootmisc } -start() { - ebegin "Starting D-BUS system messagebus" +start_pre() { /usr/bin/dbus-uuidgen --ensure=/etc/machine-id # 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 $? + checkpath -q -d /var/run/dbus } -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} +stop_post() { + [ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}" } 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} + eend $? } -- 2.39.5