[Cluster-devel] cluster/cman/init.d cman.in

[adas@sourceware.org <adas@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	adas at sourceware.org	2008-01-18 16:47:02

Modified files:
	cman/init.d    : cman.in 

Log message:
	lon's patch removes 'Domain-0' check which was breaking xvm because cman starts before xend. patch also allows you to put NODENAME in /etc/sysconfig/cluster

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/init.d/cman.in.diff?cvsroot=cluster&r1=1.1&r2=1.2

--- cluster/cman/init.d/cman.in	2008/01/07 05:52:28	1.1
+++ cluster/cman/init.d/cman.in	2008/01/18 16:47:01	1.2
@@ -53,6 +53,8 @@
 
 [ -n "$CLUSTERNAME" ] && cman_join_opts="-c $CLUSTERNAME"
 
+[ -n "$NODENAME" ] && cman_join_opts+=" -n $NODENAME"
+
 load_modules()
 {
     errmsg=$( /sbin/modprobe configfs 2>&1 ) || return 1
@@ -196,12 +198,6 @@
     which xm &> /dev/null || return 1
 	
     #
-    # Check for presence of Domain-0; if it's not there, we can't
-    # run xvmd.
-    #
-    xm list --long 2> /dev/null | grep -q "Domain-0" || return 1
-	
-    #
     # Check for presence of /cluster/fence_xvmd in cluster.conf
     # (If -X is specified, it doesn't matter if it's in cluster.conf;
     #  we'll start it anyway since ccsd is not required)