X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-replicate;h=e06776c71fd7dbfabad8a11a49cb123aebdb594d;hp=26158b975ebd8a73202beaed282a2e9261ba2278;hb=775666c5b0ea751b6fc5db55b0264612ad116a0b;hpb=d50247bd0ac0bf193b1f65a097e16af7b0ac87fa

diff --git a/ud-replicate b/ud-replicate
index 26158b9..e06776c 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -37,7 +37,6 @@ tempfile2=''
 
 cleanup ()
 {
-  rm -f lock
   rm -rf $tempdir
   rm -f  $tempfile
   rm -f  $tempfile2
@@ -49,9 +48,13 @@ HOST=`hostname -f`
 SYNCHOST=`ud-config synchost`;
 LOCALSYNCON=`ud-config localsyncon`;
 EMAILAPPEND=`ud-config emailappend`;
-cd /tmp/
-cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
-lockfile -r 1 -l 3600 lock
+cd /var/lib/misc
+exec 200< "."
+if ! flock -w 60 -e 200; then
+    log "Cannot acquire lock on `pwd`"
+    exit 1
+fi
+
 trap cleanup exit
 
 case $HOST in