cluster: STABLE3 - cman init: stop using which and drop requirements on xen

cluster: STABLE3 - cman init: stop using which and drop requirements on xen

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a77eb4aaf93bbf1d1616eab487b81314ff1ce050
Commit:        a77eb4aaf93bbf1d1616eab487b81314ff1ce050
Parent:        6dafab32d6615b86f7365c0504a8784fc1d32019
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Fri Mar 27 14:59:38 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Mar 27 20:05:48 2009 +0100

cman init: stop using which and drop requirements on xen

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 cman/init.d/cman.in |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 4da4109..0540f85 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -59,7 +59,7 @@ if [ -d /etc/default ]; then
 	[ -f /etc/default/cluster ] && . /etc/default/cluster
 	[ -f /etc/default/cman ] && . /etc/default/cman
 	[ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/cman"
-	[ -z "$(which chkconfig)" ] && alias chkconfig=local_chkconfig
+	type chkconfig > /dev/null 2>&1 || alias chkconfig=local_chkconfig
 fi
 
 # CMAN_CLUSTER_TIMEOUT -- amount of time to wait for joinging a cluster
@@ -341,11 +341,7 @@ fence_xvmd_enabled()
 {
 	fence_join_enabled || return 1
 
-	#
-	# Check for the 'xm' binary.  If it's not here, we are not
-	# running on a machine capable of running xvmd.
-	#
-	which xm > /dev/null 2>&1 || return 1
+	type virsh > /dev/null 2>&1 || return 1
 
 	#
 	# Check for presence of /cluster/fence_xvmd in cluster.conf