cluster: RHEL6 - Clean up the pid file when exiting after running with -f

Ryan McCabe rmccabe at fedoraproject.org
Tue May 1 15:01:40 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9757156c569b05517cdc6173e334f22829e07854
Commit:        9757156c569b05517cdc6173e334f22829e07854
Parent:        1e1c4989fcb4e3a447deed560cda823be7535296
Author:        Ryan McCabe <rmccabe at redhat.com>
AuthorDate:    Tue Apr 24 09:16:31 2012 -0400
Committer:     Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Tue May 1 10:58:33 2012 -0400

Clean up the pid file when exiting after running with -f

Signed-off-by: Ryan McCabe <rmccabe at redhat.com>
Reviewed-by: Lon Hohberger <lhh at redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 rgmanager/src/daemons/cpglockd.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/rgmanager/src/daemons/cpglockd.c b/rgmanager/src/daemons/cpglockd.c
index aa052b3..9f9f635 100644
--- a/rgmanager/src/daemons/cpglockd.c
+++ b/rgmanager/src/daemons/cpglockd.c
@@ -1649,7 +1649,6 @@ out2:
 out3:
 	cman_finish(cman_handle);
 out4:
-	if (!nofork)
-		daemon_cleanup();
+	daemon_cleanup();
 	return exit_status;
 }


More information about the cluster-commits mailing list