[SCM] debian-live/live-helper branch, master, updated. 1.0_a35-1-26-g9bb9d02

[Daniel Baumann]

The branch, master has been updated
       via  9bb9d029955d4d9cc0cd8f4f5f68183e5bccde76 (commit)
      from  17e172bbdf12b760c87ffed882f01965ec647d14 (commit)


- Shortlog ------------------------------------------------------------
9bb9d02 Removing the unmounting of pseudo filesystems from the trap call, needs some other changes before it can safely be done.

Summary of changes:
 functions/lockfile.sh |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 9bb9d029955d4d9cc0cd8f4f5f68183e5bccde76
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Nov 13 12:56:48 2007 +0100

    Removing the unmounting of pseudo filesystems from the trap call, needs some other changes before it can safely be done.

diff --git a/functions/lockfile.sh b/functions/lockfile.sh
index eda8d81..189d0c2 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}"
 }

-- 
debian-live/live-helper