diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-11-11 22:03:02 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:29 +0100 |
| commit | 7bbb741e1c10df33f565f8482046c95e4fe0287d (patch) | |
| tree | 5893bc7561fce4dc1d88b82f37109449ae50653c /functions | |
| parent | 2a9079644708eedd190b82675a76372f9c8abd7e (diff) | |
| download | vyos-live-build-7bbb741e1c10df33f565f8482046c95e4fe0287d.tar.gz vyos-live-build-7bbb741e1c10df33f565f8482046c95e4fe0287d.zip | |
Extending --force to also cover lockfiles to avoid recursive loop within trap.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/lockfile.sh | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/functions/lockfile.sh b/functions/lockfile.sh index 8af675771..eda8d8169 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 } |