From: Andrew Price <andy@andrewprice.me.uk>
Date: Fri, 25 Jul 2008 09:02:48 +0000 (+0200)
Subject: rgmanger: remove check on cluster.conf from rgmanager init script
X-Git-Url: https://www.sourceware.org/git/?a=commitdiff_plain;h=691c72052655c0f7c8142c35145237e122ae6b86;p=cluster.git

rgmanger: remove check on cluster.conf from rgmanager init script

cluster.conf is not the only authoritative configuration file anymore.
LDAP and others could be in place.

Remove the check and allow rgmanager to start.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---

diff --git a/rgmanager/init.d/Makefile b/rgmanager/init.d/Makefile
index 3f5104d7..5ead8951 100644
--- a/rgmanager/init.d/Makefile
+++ b/rgmanager/init.d/Makefile
@@ -2,20 +2,12 @@ TARGET= rgmanager
 
 INITDT=$(TARGET)
 
-all: $(TARGET)
+all:
 
 include ../../make/defines.mk
-include $(OBJDIR)/make/clean.mk
 include $(OBJDIR)/make/install.mk
 include $(OBJDIR)/make/uninstall.mk
 
-$(TARGET):
-	cat $(S)/$(TARGET).in | sed \
-		-e 's#@CONFDIR@#${CONFDIR}#g' \
-		-e 's#@CONFFILE@#${CONFFILE}#g' \
-	> $(TARGET)
-	chmod 755 $(TARGET)
-
 clean: generalclean
 
 check:
diff --git a/rgmanager/init.d/rgmanager.in b/rgmanager/init.d/rgmanager
similarity index 97%
rename from rgmanager/init.d/rgmanager.in
rename to rgmanager/init.d/rgmanager
index 57269ef9..6ae333ad 100644
--- a/rgmanager/init.d/rgmanager.in
+++ b/rgmanager/init.d/rgmanager
@@ -28,7 +28,6 @@ export PATH
 
 ID="Cluster Service Manager"
 RGMGRD="clurgmgrd"
-CFG_FILE="@CONFDIR@/@CONFFILE@"
 
 LOG_ERR=3
 LOG_WARNING=4
@@ -91,7 +90,6 @@ case $1 in
 			echo "Cannot start $ID: Networking not configured"
 			exit 1
 		fi
-		[ -f "$CFG_FILE" ] || exit 0
 
 		echo -n $"Starting $ID: "
 		daemon $RGMGRD $RGMGR_OPTS