[Cluster-devel] cluster/rgmanager man/Makefile src/daemons/rg_ ...

[lhh at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	lhh at sourceware.org	2007-02-20 19:54:07

Modified files:
	rgmanager/man  : Makefile 
	rgmanager/src/daemons: rg_state.c 

Log message:
	Fix 229254 - extraneous man pages, 228823 - allow disable of services stuck in 'stopping' state

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/man/Makefile.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.1.2.1&r2=1.1.2.1.6.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/rg_state.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.4.2.8.6.6&r2=1.4.2.8.6.7

--- cluster/rgmanager/man/Makefile	2005/01/18 22:35:35	1.1.2.1
+++ cluster/rgmanager/man/Makefile	2007/02/20 19:54:07	1.1.2.1.6.1
@@ -12,8 +12,8 @@
 ###############################################################################
 top_srcdir=..
 UNINSTALL = ${top_srcdir}/scripts/uninstall.pl
-TARGETS = clubufflush.8 clufindhostname.8 clulog.8 clunfsops.8 \
-	  clurgmgrd.8 clurmtabd.8 clushutdown.8 clustat.8 clusvcadm.8
+TARGETS = clubufflush.8 clufindhostname.8 clulog.8 \
+	  clurgmgrd.8 clurmtabd.8 clustat.8 clusvcadm.8
 
 include ${top_srcdir}/make/defines.mk
 
--- cluster/rgmanager/src/daemons/rg_state.c	2007/01/22 23:10:01	1.4.2.8.6.6
+++ cluster/rgmanager/src/daemons/rg_state.c	2007/02/20 19:54:07	1.4.2.8.6.7
@@ -376,10 +376,6 @@
 		break;
 		
 	case RG_STATE_STOPPING:
-		printf("Service %s is stopping right now\n", svcName);
-		ret = 2;
-		break;
-
 	case RG_STATE_STARTED:
 	case RG_STATE_CHECK:
 	case RG_STATE_STARTING: