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 3f5104d7cb67ecba734e33e9c78d16a84a8e4cf4..5ead895188118d9742e5a7c84bbeb2c794041fe9 100644 (file)
--- 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 57269ef93a5ca05c7a9195e1fd05c42fb55939dc..6ae333adac48212d173015b2352c9401f7330ade 100644 (file)
--- 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