From aef10c280820f816338610be5e94e2ca63ca8f5e Mon Sep 17 00:00:00 2001
From: deajan <ozy.netpower.fr>
Date: Mon, 13 Apr 2015 17:26:12 +0200
Subject: [PATCH] Removed legacy lockfile code from init script

---
 CHANGELOG.md | 1 +
 osync-srv    | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cde8a1..67f951c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ UNDER WORK
 RECENT CHANGES
 --------------
 
+- Removed legacy lockfile code from init script
 - Removed hardcoded program name from init script
 - 01 Avr. 2015: Osync v1.00pre
 - Improved and refactored the soft deletion routine by merging conflict backup and soft deletion
diff --git a/osync-srv b/osync-srv
index 30c9d2e..cccfa38 100755
--- a/osync-srv
+++ b/osync-srv
@@ -11,8 +11,7 @@ progexec=osync.sh
 progpath=/usr/local/bin
 confdir=/etc/osync
 pidfile=/var/run/$prog
-lockfile=/var/lock/subsys/$prog
-SCRIPT_BUILD=1304201501
+SCRIPT_BUILD=1304201502
 
 if [ ! -f $progpath/$progexec ] && [ ! -f $progexec ]
 then
@@ -84,7 +83,7 @@ stop() {
 			fi
 		else
 			rm -f $pfile
-			echo "$pfile is dead but lockfile exists."
+			echo "$prog instance $pfile (pid $(cat $pfile)) is dead but pidfile exists."
 		fi
 	done
 }
@@ -104,7 +103,7 @@ status() {
 		then
 			echo "$prog instance $(basename $pfile) is running (pid $(cat $pfile))"
 		else
-			echo "$pfile is dead but lockfile exists."
+			echo "$prog instance $pfile (pid $(cat $pfile)) is dead but pidfile exists."
 			$errno=1
 		fi
 	done