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

[Daniel Baumann]

The branch, master has been updated
       via  fb1e3ce43a00114cef8aa3447b7bde57368dc645 (commit)
       via  13e39acb9f2c6936b45aa5690ba0359efb949064 (commit)
      from  d7fb22ca8b4a5d1d58be259994943c5b271d0ab0 (commit)


- Shortlog ------------------------------------------------------------
fb1e3ce Adding some more fakeroot related fixes from An-Cheng Huang <ancheng at vyatta.com>.
13e39ac Fixing typing error, thanks to An-Cheng Huang <ancheng at vyatta.com>.

Summary of changes:
 helpers/lh_chroot_devpts |   18 ++++++++++++------
 helpers/lh_chroot_hacks  |    2 +-
 helpers/lh_chroot_proc   |    6 +++---
 3 files changed, 16 insertions(+), 10 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit fb1e3ce43a00114cef8aa3447b7bde57368dc645
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Nov 11 23:05:55 2007 +0100

    Adding some more fakeroot related fixes from An-Cheng Huang <ancheng at vyatta.com>.

diff --git a/helpers/lh_chroot_devpts b/helpers/lh_chroot_devpts
index 0024fb9..07fec4d 100755
--- a/helpers/lh_chroot_devpts
+++ b/helpers/lh_chroot_devpts
@@ -52,11 +52,14 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Creating mountpoint
-		mkdir -p chroot/dev/pts
+		if [ "${LH_USE_FAKEROOT}" != "enabled" ]
+		then
+			# Creating mountpoint
+			mkdir -p chroot/dev/pts
 
-		# Mounting /dev/pts
-		${LH_ROOT_COMMAND} mount devpts-live -t devpts chroot/dev/pts
+			# Mounting /dev/pts
+			${LH_ROOT_COMMAND} mount devpts-live -t devpts chroot/dev/pts
+		fi
 
 		# Creating stage file
 		Create_stagefile .stage/chroot_devpts
@@ -70,9 +73,12 @@ case "${1}" in
 		Create_lockfile .lock
 
 		# Unmounting /dev/pts
-		if [ -e chroot/dev/pts/0 ]
+		if [ "${LH_USE_FAKEROOT}" != "enabled" ]
 		then
-			${LH_ROOT_COMMAND} umount chroot/dev/pts
+			if [ -e chroot/dev/pts/0 ]
+			then
+				${LH_ROOT_COMMAND} umount chroot/dev/pts
+			fi
 		fi
 
 		# Removing stage file
diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc
index 378703a..c0e1a76 100755
--- a/helpers/lh_chroot_proc
+++ b/helpers/lh_chroot_proc
@@ -59,13 +59,13 @@ case "${1}" in
 
 			# Mounting /proc
 			${LH_ROOT_COMMAND} mount proc-live -t proc chroot/proc
-
-			# Creating stage file
-			Create_stagefile .stage/chroot_proc
 		else
 			rm -rf chroot/proc
 			ln -s /proc chroot/
 		fi
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_proc
 		;;
 
 	remove)

commit 13e39acb9f2c6936b45aa5690ba0359efb949064
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Nov 11 23:00:43 2007 +0100

    Fixing typing error, thanks to An-Cheng Huang <ancheng at vyatta.com>.

diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index cd5420f..524b3e2 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -99,7 +99,7 @@ echo "0.0 0 0.0" > chroot/etc/adjtime
 
 # Remove cruft
 rm -f chroot/boot/initrd*bak*
-rm -f /etc/apt/trusted.gpg~
+rm -f chroot/etc/apt/trusted.gpg~
 rm -f chroot/etc/group- chroot/etc/passwd-
 rm -f chroot/etc/gshadow- chroot/etc/shadow-
 rm -f chroot/var/cache/debconf/*-old

-- 
debian-live/live-helper