From 7bbb741e1c10df33f565f8482046c95e4fe0287d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 11 Nov 2007 22:03:02 +0100
Subject: Extending --force to also cover lockfiles to avoid recursive loop
within trap.
---
functions/lockfile.sh | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/functions/lockfile.sh b/functions/lockfile.sh
index 8af6757..eda8d81 100755
--- a/functions/lockfile.sh
+++ b/functions/lockfile.sh
@@ -23,15 +23,18 @@ Check_lockfile ()
Create_lockfile ()
{
- FILE="${1}"
- DIRECTORY="$(dirname ${1})"
+ if [ "${LH_FORCE}" != "enabled" ]
+ then
+ FILE="${1}"
+ DIRECTORY="$(dirname ${1})"
- # Creating lock directory
- mkdir -p "${DIRECTORY}"
+ # Creating lock directory
+ mkdir -p "${DIRECTORY}"
- # Creating lock trap
- trap 'ret=${?}; '"rm -f \"${FILE}\"; "'for FILESYSTEM in devpts proc sysfs; do lh_chroot_${FILESYSTEM} remove; done; exit ${ret}' EXIT
+ # Creating lock trap
+ trap 'ret=${?}; '"rm -f \"${FILE}\"; "'for FILESYSTEM in devpts proc sysfs; do lh_chroot_${FILESYSTEM} remove --force; done; exit ${ret}' EXIT
- # Creating lock file
- touch "${FILE}"
+ # Creating lock file
+ touch "${FILE}"
+ fi
}
--
cgit v1.0