From cc00c075c937442a79c1320d8a4d1c51fdafef5412573d3914e34cdc34d516b8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 15 Oct 2010 07:27:43 +0000 Subject: [PATCH] Accepting request 50380 from home:elvigia:branches:Base:System OBS-URL: https://build.opensuse.org/request/show/50380 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=30 --- dbus-1-x11.changes | 6 ++++++ dbus-1-x11.spec | 5 ++--- dbus-1.changes | 6 ++++++ rc.boot.dbus | 8 +++++++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index 7ebc811..4da385a 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 12 14:35:53 UTC 2010 - cristian.rodriguez@opensuse.org + +- ConsoleKit may not be installed on the system, so kill + the process at "stop" only if it is running + ------------------------------------------------------------------- Fri Sep 24 18:21:46 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/dbus-1-x11.spec b/dbus-1-x11.spec index 9f4ae42..a3cee75 100644 --- a/dbus-1-x11.spec +++ b/dbus-1-x11.spec @@ -1,7 +1,7 @@ # -# spec file for package dbus-1-x11 (Version 1.4.0) +# spec file for package dbus-1-x11 (Version 1.2.16) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,6 @@ # norootforbuild - Name: dbus-1-x11 BuildRequires: xorg-x11-devel Url: http://dbus.freedesktop.org/ diff --git a/dbus-1.changes b/dbus-1.changes index 7ebc811..4da385a 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 12 14:35:53 UTC 2010 - cristian.rodriguez@opensuse.org + +- ConsoleKit may not be installed on the system, so kill + the process at "stop" only if it is running + ------------------------------------------------------------------- Fri Sep 24 18:21:46 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/rc.boot.dbus b/rc.boot.dbus index 88f6a50..94928ac 100644 --- a/rc.boot.dbus +++ b/rc.boot.dbus @@ -30,6 +30,10 @@ DBUS_MACHINE_ID=$DBUS_MACHINE_ID_DIR/machine-id DBUS_UUIIDGEN_BIN=/bin/dbus-uuidgen +CONSOLEKIT_DAEMON_BIN="/usr/sbin/console-kit-daemon" +CONSOLEKIT_PID_DIR="/var/run/ConsoleKit" +CONSOLEKIT_PID=$CONSOLEKIT_PID_DIR/pid + # Source LSB init functions # providing start_daemon, killproc, pidofproc, # log_success_msg, log_failure_msg and log_warning_msg. @@ -72,7 +76,9 @@ case "$1" in ;; stop) echo -n "Shutting down D-Bus daemon" - killproc -TERM /usr/sbin/console-kit-daemon + if [ -x $CONSOLEKIT_DAEMON_BIN ] ; then + killproc -p $CONSOLEKIT_PID -TERM $CONSOLEKIT_DAEMON_BIN + fi killproc -p $DBUS_DAEMON_PID -TERM $DBUS_DAEMON_BIN rc_status -v ;;