Making sure that the pid on lockfile reffers to an rsync backup process

diff --git a/handlers/rsync.in b/handlers/rsync.in
index cf304ed6660e8892ab1bb0f1f60ec0968dc8cc40..f09281228c235c9096a8e3abe8233afb009449ac 100644 (file)
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -849,7 +849,7 @@ function set_lockfile {
   if [ ! -z "$lockfile" ]; then
     mkdir -p `dirname $lockfile`
     if ( set -o noclobber; echo "$$" > "$lockfile" ) &> /dev/null; then
-      trap 'rm -f "$lockfile"' INT TERM EXIT
+      trap 'unset_lockfile' INT TERM EXIT
     else
       info "Could not create lockfile $lockfile, exiting"
       exit
@@ -861,18 +861,19 @@ function set_lockfile {
 function unset_lockfile {
 
   if [ ! -z "$lockfile" ]; then
-    $rm $lockfile || warning "Could not remove lockfile $lockfile"
+    $rm -f $lockfile || warning "Could not remove lockfile $lockfile"
   fi
 
 }
 
 function check_lockfile {
 
-  local pid
+  local pid process
 
   if [ ! -z "$lockfile" ] && [ -f "$lockfile" ]; then
     pid="`cat $lockfile`"
-    if ps $pid &> /dev/null; then
+    process="`ps --no-headers -o comm $pid`"
+    if [ "$?" == "0" ] && [ "`ps --no-headers -o comm $$`" == "$process" ]; then
       info "Another backup is running for $lockfile, skipping run"
       exit
     else