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

[Daniel Baumann]

The branch, master has been updated
       via  be5c114a90275c73d95385303a91d6f4273be828 (commit)
       via  30d76edc02dd8ee6b0f8b682761fa333291683bf (commit)
      from  e6d09c8eeb55b694b0f770c6b2c4c127df58e6c1 (commit)


- Shortlog ------------------------------------------------------------
be5c114 Making umount calls check if they are actually necessary.
30d76ed Fixing trap call, thanks to An-Cheng Huang <ancheng at vyatta.com>.

Summary of changes:
 functions/lockfile.sh    |    2 +-
 helpers/lh_chroot_devpts |    5 ++++-
 helpers/lh_chroot_proc   |    5 ++++-
 helpers/lh_chroot_sysfs  |    5 ++++-
 4 files changed, 13 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit be5c114a90275c73d95385303a91d6f4273be828
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Nov 11 21:33:43 2007 +0100

    Making umount calls check if they are actually necessary.

diff --git a/functions/lockfile.sh b/functions/lockfile.sh
index 81fe559..8af6757 100755
--- a/functions/lockfile.sh
+++ b/functions/lockfile.sh
@@ -30,7 +30,7 @@ Create_lockfile ()
 	mkdir -p "${DIRECTORY}"
 
 	# Creating lock trap
-	trap 'ret=${?}; '"rm -f \"${FILE}\"; "'for FILESYSTEM in devpts proc sysfs; do lh_chroot_${FILESYSTEM} remove || continue; done; exit ${ret}' EXIT
+	trap 'ret=${?}; '"rm -f \"${FILE}\"; "'for FILESYSTEM in devpts proc sysfs; do lh_chroot_${FILESYSTEM} remove; done; exit ${ret}' EXIT
 
 	# Creating lock file
 	touch "${FILE}"
diff --git a/helpers/lh_chroot_devpts b/helpers/lh_chroot_devpts
index 236777a..0024fb9 100755
--- a/helpers/lh_chroot_devpts
+++ b/helpers/lh_chroot_devpts
@@ -70,7 +70,10 @@ case "${1}" in
 		Create_lockfile .lock
 
 		# Unmounting /dev/pts
-		${LH_ROOT_COMMAND} umount chroot/dev/pts > /dev/null 2>&1
+		if [ -e chroot/dev/pts/0 ]
+		then
+			${LH_ROOT_COMMAND} umount chroot/dev/pts
+		fi
 
 		# Removing stage file
 		rm -f .stage/chroot_devpts
diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc
index 7d5688d..378703a 100755
--- a/helpers/lh_chroot_proc
+++ b/helpers/lh_chroot_proc
@@ -85,7 +85,10 @@ case "${1}" in
 
 			# Unmounting /proc
 			#fuser -km chroot/proc
-			${LH_ROOT_COMMAND} umount chroot/proc > /dev/null 2>&1
+			if [ -e chroot/proc/version ]
+			then
+				${LH_ROOT_COMMAND} umount chroot/proc
+			fi
 		else
 			rm -rf chroot/proc
 			mkdir -p chroot/proc
diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs
index fef710d..b7931ae 100755
--- a/helpers/lh_chroot_sysfs
+++ b/helpers/lh_chroot_sysfs
@@ -79,7 +79,10 @@ case "${1}" in
 		then
 			# Unmounting /sys
 			#fuser -km chroot/sys
-			${LH_ROOT_COMMAND} umount chroot/sys > /dev/null 2>&1
+			if [ -e chroot/sys/kernel ]
+			then
+				${LH_ROOT_COMMAND} umount chroot/sys
+			fi
 		else
 			rm -rf chroot/sys
 			mkdir -p chroot/sys

commit 30d76edc02dd8ee6b0f8b682761fa333291683bf
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Nov 11 21:29:25 2007 +0100

    Fixing trap call, thanks to An-Cheng Huang <ancheng at vyatta.com>.

diff --git a/functions/lockfile.sh b/functions/lockfile.sh
index aa30222..81fe559 100755
--- a/functions/lockfile.sh
+++ b/functions/lockfile.sh
@@ -30,7 +30,7 @@ Create_lockfile ()
 	mkdir -p "${DIRECTORY}"
 
 	# Creating lock trap
-	trap 'ret=${?}; '"rm -f \"${FILE}\"; for FILESYSTEM in devpts proc sys; do lh_chroot_${FILESYSTEM} remove || continue; done"' exit ${ret}' EXIT
+	trap 'ret=${?}; '"rm -f \"${FILE}\"; "'for FILESYSTEM in devpts proc sysfs; do lh_chroot_${FILESYSTEM} remove || continue; done; exit ${ret}' EXIT
 
 	# Creating lock file
 	touch "${FILE}"

-- 
debian-live/live-helper