cluster: RHEL6 - Revert "cman: create and destroy lockfile on restart"

Christine Caulfield chrissie at fedoraproject.org
Tue Jul 23 08:26:01 UTC 2013


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=f0b76db91e8346e9abe3ea6fe4b85ffa03998fe3
Commit:        f0b76db91e8346e9abe3ea6fe4b85ffa03998fe3
Parent:        2352c4bad21a4a470ad7f51a18c1d28afcb23455
Author:        Christine Caulfield <ccaulfie at redhat.com>
AuthorDate:    Tue Jul 23 09:18:46 2013 +0100
Committer:     Christine Caulfield <ccaulfie at redhat.com>
CommitterDate: Tue Jul 23 09:18:46 2013 +0100

Revert "cman: create and destroy lockfile on restart"

This reverts commit 2352c4bad21a4a470ad7f51a18c1d28afcb23455.

This fix was alerady included in the script, using a slightly different method
---
 cman/init.d/cman.in |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 7933478..384fa2f 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -834,7 +834,6 @@ start()
 		fence_join_enabled \
 		"Joining fence domain"
 
-    touch $LOCK_FILE
 }
 
 stop()
@@ -884,8 +883,6 @@ stop()
 	runwrap stop_configfs \
 		none \
 		"Unmounting configfs"
-
-    rm -f $LOCK_FILE
 }
 
 cmanstatus()
@@ -936,7 +933,7 @@ fi
 # See how we were called.
 case "$1" in
 start)
-	start "$2" 
+	start "$2" && touch $LOCK_FILE
 	if [ "$INITLOGLEVEL" = "quiet" ]; then
 		success
 		echo
@@ -947,7 +944,7 @@ stop)
 	if [ -n "$2" ] && [ "$2" = "remove" ]; then
 		cmanremove=remove
 	fi
-	stop
+	stop && rm -f $LOCK_FILE
 	if [ "$INITLOGLEVEL" = "quiet" ]; then
 		success
 		echo


More information about the cluster-commits mailing list