From: Milan Broz <mbroz@redhat.com>
Date: Thu, 3 Jun 2010 21:03:53 +0000 (+0000)
Subject: Fix clvmd initscript restart command to start clvmd if not yet running.
X-Git-Tag: old-v2_02_67~2
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=8c19b52bda36eb70f3d4a084529eaee1221e3e9a;p=lvm2.git

Fix clvmd initscript restart command to start clvmd if not yet running.
---

diff --git a/WHATS_NEW b/WHATS_NEW
index ae753e0d4..e767e0eb1 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.67 -
 ===============================
+  Fix clvmd initscript restart command to start clvmd if not yet running.
   Use absolute paths for clvmd restart.
   Require partial option in lvchange --refresh for partial LVs.
   Do not fail lvm_init() if init_logging() or _init_rand() generates an errno.
diff --git a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in
index 53e5c3294..1a03984c8 100644
--- a/scripts/clvmd_init_red_hat.in
+++ b/scripts/clvmd_init_red_hat.in
@@ -152,13 +152,15 @@ restart() {
 
 	# Try to get clvmd to restart itself. This will preserve 
 	# exclusive LV locks
-	action "Restarting $DAEMON: " $DAEMON -S || return $?
+	action "Restarting $DAEMON: " $DAEMON -S
 
 	# If that fails then do a normal stop & restart
 	if  [ $? != 0 ]; then
 	    stop && start
+	    return $?
 	else
 	    touch $LOCK_FILE
+	    return 0
 	fi
 }