From e25453ccd46d265de1d5ef720e40977786a6fb1b Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Jun 11 2012 15:58:49 +0000
Subject: sanlock/wdmd: use /var/log/subsys/file


sanlock was not using it at all, and wdmd was
using it incorrectly.

bz 830848

Signed-off-by: David Teigland <teigland@redhat.com>

---

diff --git a/init.d/sanlock b/init.d/sanlock
index ae5843b..636d581 100644
--- a/init.d/sanlock
+++ b/init.d/sanlock
@@ -22,7 +22,8 @@
 . /etc/rc.d/init.d/functions
 
 prog="sanlock"
-lockfile="/var/run/$prog/$prog.pid"
+runfile="/var/run/$prog/$prog.pid"
+lockfile="/var/lock/subsys/$prog"
 exec="/usr/sbin/$prog"
 
 SANLOCKUSER="sanlock"
@@ -42,13 +43,13 @@ start() {
 	daemon $prog daemon $SANLOCKOPTS
 	retval=$?
 	echo
-
+	[ $retval -eq 0 ] && touch $lockfile
 	return $retval
 }
 
 stop() {
 	echo -n $"Sending stop signal $prog: "
-	killproc -p $lockfile $prog -TERM
+	killproc -p $runfile $prog -TERM
 	retval=$?
 	echo
 
@@ -58,7 +59,7 @@ stop() {
 
 	echo -n $"Waiting for $prog to stop:"
 	timeout=10
-	while [ -e $lockfile ]; do
+	while [ -e $runfile ]; do
 		sleep 1
 		timeout=$((timeout - 1))
 		if [ "$timeout" -le 0 ]; then
@@ -68,6 +69,7 @@ stop() {
 	done
 
 	success; echo
+	rm -f $lockfile
 	return $retval
 }
 
diff --git a/init.d/wdmd b/init.d/wdmd
index d5334c4..9ec7b8c 100644
--- a/init.d/wdmd
+++ b/init.d/wdmd
@@ -22,7 +22,8 @@
 . /etc/rc.d/init.d/functions
 
 prog="wdmd"
-lockfile="/var/run/$prog/$prog.pid"
+runfile="/var/run/$prog/$prog.pid"
+lockfile="/var/lock/subsys/$prog"
 exec="/usr/sbin/$prog"
 
 WDMDGROUP="sanlock"
@@ -48,10 +49,11 @@ start() {
 
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc -p $lockfile $prog -TERM
+	killproc -p $runfile $prog -TERM
 	retval=$?
 	echo
 	[ $retval -eq 0 ] && rm -f $lockfile
+	return $retval
 }
 
 restart() {