From a7a05deb37b3db6aa3606f488467f621c40ce32d Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Thu, 2 May 2013 07:03:12 +0200
Subject: lib/common.sh: Introduce locking helper functions

Reduces code duplication.

With makechrootpkg not calling mkarchroot anymore,
the lock handover protocol is unneeded.

arch-nspawn does not do any locking, so add protection to archbuild.
---
 mkarchroot.in | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'mkarchroot.in')

diff --git a/mkarchroot.in b/mkarchroot.in
index 68db64c..970bbb9 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -49,29 +49,13 @@ else
 	cache_dirs=(${cache_dir})
 fi
 
-# {{{ functions
-chroot_lock () {
-	# Only reopen the FD if it wasn't handed to us
-	if [[ $(readlink -f /dev/fd/9) != "${working_dir}.lock" ]]; then
-	  exec 9>"${working_dir}.lock"
-	fi
-
-	# Lock the chroot. Take note of the FD number.
-	if ! flock -n 9; then
-		stat_busy "Locking chroot"
-		flock 9
-		stat_done
-	fi
-}
-# }}}
-
 umask 0022
 
 [[ -e $working_dir ]] && die "Working directory '$working_dir' already exists"
 
 mkdir -p "$working_dir"
 
-chroot_lock
+lock 9 "${working_dir}.lock" "Locking chroot"
 
 if [[ $(stat -f -c %T "$working_dir") == btrfs ]]; then
 	rmdir "$working_dir"
-- 
cgit v1.2.3-70-g09d2