Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=bdaa8d1ce44b5b... Commit: bdaa8d1ce44b5bed9f32da2c27ff934989815046 Parent: 9b6944ca86fcad4de783fb7ce378338992ef3e69 Author: Fabio M. Di Nitto fdinitto@redhat.com AuthorDate: Thu Jul 11 09:48:00 2013 +0200 Committer: Fabio M. Di Nitto fdinitto@redhat.com CommitterDate: Thu Jul 11 10:15:32 2013 +0200
cman init: fix handling of lock file
missing handling of lock file in operations other than start/stop could lead in a situation where cman was running without a lock file.
Resolves: rhbz#982698
Original patch by Shane Bradley sbradley@redhat.com
Signed-off-by: Fabio M. Di Nitto fdinitto@redhat.com --- cman/init.d/cman.in | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index a50f7be..3e5f881 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -736,13 +736,13 @@ start() none \ "Mounting configfs"
- [ "$breakpoint" = "setup" ] && exit 0 + [ "$breakpoint" = "setup" ] && return 0
runwrap start_cman \ none \ "Starting cman"
- [ "$breakpoint" = "join" ] && exit 0 + [ "$breakpoint" = "join" ] && return 0
runwrap start_qdiskd \ qdiskd_enabled \ @@ -752,7 +752,7 @@ start() none \ "Waiting for quorum"
- [ "$breakpoint" = "quorum" ] && exit 0 + [ "$breakpoint" = "quorum" ] && return 0
runwrap start_groupd \ groupd_enabled \ @@ -778,7 +778,7 @@ start() cmannotifyd_enabled \ "Starting cmannotifyd"
- [ "$breakpoint" = "daemons" ] && exit 0 + [ "$breakpoint" = "daemons" ] && return 0
runwrap unfence_self \ none \ @@ -906,14 +906,14 @@ stop) ;; restart|reload|force-reload) cmanremove=remove - stop - start + stop && rm -f $LOCK_FILE + start && touch $LOCK_FILE ;; condrestart|try-restart) if cmanstatus; then cmanremove=remove - stop - start + stop && rm -f $LOCK_FILE + start && touch $LOCK_FILE fi ;; status)