diff options
author | Daniel Baumann <daniel@debian.org> | 2007-11-13 12:56:48 +0100 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:29 +0100 |
commit | 9ce7afd0b30723491ec14162724324dfae24bf07 (patch) | |
tree | 374595a6efadb79a145bb37fea12bfa231daa32f /functions | |
parent | 0c2e079c1050161852d728c31849eb9e67b46fad (diff) | |
download | vyos-live-build-9ce7afd0b30723491ec14162724324dfae24bf07.tar.gz vyos-live-build-9ce7afd0b30723491ec14162724324dfae24bf07.zip |
Removing the unmounting of pseudo filesystems from the trap call, needs some other changes before it can safely be done.
Diffstat (limited to 'functions')
-rwxr-xr-x | functions/lockfile.sh | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/functions/lockfile.sh b/functions/lockfile.sh index eda8d8169..189d0c231 100755 --- a/functions/lockfile.sh +++ b/functions/lockfile.sh @@ -23,18 +23,15 @@ Check_lockfile () Create_lockfile () { - if [ "${LH_FORCE}" != "enabled" ] - then - FILE="${1}" - DIRECTORY="$(dirname ${1})" + 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 --force; done; exit ${ret}' EXIT + # Creating lock trap + trap 'ret=${?}; '"rm -f \"${FILE}\";"' exit ${ret}' EXIT - # Creating lock file - touch "${FILE}" - fi + # Creating lock file + touch "${FILE}" } |