From mboxrd@z Thu Jan  1 00:00:00 1970
From: kupcevic@sourceware.org <kupcevic@sourceware.org>
Date: 5 Sep 2006 19:53:40 -0000
Subject: [Cluster-devel] conga conga.spec.in.in clustermon.spec.in.in
Message-ID: <20060905195340.25633.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-09-05 19:53:40

Modified files:
	.              : conga.spec.in.in clustermon.spec.in.in 

Log message:
	Redirect 'd-bus reload' error messages to /dev/null

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.39&r2=1.40
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.12&r2=1.13

--- conga/conga.spec.in.in	2006/08/23 19:58:42	1.39
+++ conga/conga.spec.in.in	2006/09/05 19:53:40	1.40
@@ -252,7 +252,8 @@
 
 %post -n ricci
 /sbin/chkconfig --add ricci
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` >/dev/null 2>&1
+DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
+/bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
 /sbin/service oddjobd reload >/dev/null 2>&1
 
 %preun -n ricci
@@ -263,7 +264,8 @@
 
 %postun -n ricci
 if [ "$1" == "0" ]; then
-   /bin/kill -s SIGHUP `cat /var/run/messagebus.pid` > /dev/null 2>&1
+   DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
+   /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
    /sbin/service oddjobd reload > /dev/null 2>&1
 fi
 if [ "$1" == "1" ]; then
--- conga/clustermon.spec.in.in	2006/08/22 23:01:17	1.12
+++ conga/clustermon.spec.in.in	2006/09/05 19:53:40	1.13
@@ -89,7 +89,8 @@
 
 %post -n modcluster
 /sbin/chkconfig --add modclusterd
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` > /dev/null 2>&1
+DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
+/bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
 /sbin/service oddjobd reload > /dev/null 2>&1
 
 %preun -n modcluster
@@ -100,7 +101,8 @@
 
 %postun -n modcluster
 if [ "$1" == "0" ]; then
-   /bin/kill -s SIGHUP `cat /var/run/messagebus.pid` > /dev/null 2>&1
+   DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
+   /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
    /sbin/service oddjobd reload > /dev/null 2>&1
 fi
 if [ "$1" == "1" ]; then