[SCM] debian-live/live-helper branch, master, updated. 1.0_a33-1-12-gf7777a1

[Daniel Baumann]

The branch, master has been updated
       via  f7777a171248ac8dbcf9ea14cfb8f29d9d67f7ac (commit)
      from  15f9200589c6a789ef4fb38de5398d916e615f4b (commit)


- Shortlog ------------------------------------------------------------
f7777a1 Adding lh_chroot_devpts.

Summary of changes:
 helpers/lh_binary        |    2 +
 helpers/lh_chroot        |    2 +
 helpers/lh_chroot_devpts |   82 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit f7777a171248ac8dbcf9ea14cfb8f29d9d67f7ac
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Oct 31 11:20:03 2007 +0100

    Adding lh_chroot_devpts.

diff --git a/helpers/lh_binary b/helpers/lh_binary
index be6dbd0..b6a30cd 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -39,6 +39,7 @@ lh_binary_chroot ${*}
 if [ "${LH_CHROOT_BUILD}" = "enabled" ]
 then
 	# Configuring chroot
+	lh_chroot_devpts install ${*}
 	lh_chroot_proc install ${*}
 	lh_chroot_sysfs install ${*}
 	lh_chroot_hosts install ${*}
@@ -81,4 +82,5 @@ then
 	lh_chroot_hosts remove ${*}
 	lh_chroot_sysfs remove ${*}
 	lh_chroot_proc remove ${*}
+	lh_chroot_devpts remove ${*}
 fi
diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index aafe71f..c8502bd 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -35,6 +35,7 @@ Set_defaults
 
 # Configuring chroot
 lh_chroot_cache restore ${*}
+lh_chroot_devpts install ${*}
 lh_chroot_proc install ${*}
 lh_chroot_sysfs install ${*}
 lh_chroot_debianchroot install ${*}
@@ -76,4 +77,5 @@ lh_chroot_dpkg remove ${*}
 lh_chroot_debianchroot remove ${*}
 lh_chroot_sysfs remove ${*}
 lh_chroot_proc remove ${*}
+lh_chroot_devpts remove ${*}
 lh_chroot_cache save ${*}
diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_devpts
similarity index 73%
copy from helpers/lh_chroot_sysfs
copy to helpers/lh_chroot_devpts
index f9d1f41..236777a 100755
--- a/helpers/lh_chroot_sysfs
+++ b/helpers/lh_chroot_devpts
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# lh_chroot_sysfs(1) - mount /sys
+# lh_chroot_devpts(1) - mount /dev/pts
 # Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
 #
 # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -18,7 +18,7 @@ do
 done
 
 # Setting static variables
-DESCRIPTION="mount /sys"
+DESCRIPTION="mount /dev/pts"
 HELP=""
 USAGE="${PROGRAM} {install|remove} [--force]"
 
@@ -36,7 +36,7 @@ Read_conffile config/source
 Read_conffile "${LH_CONFIG}"
 Set_defaults
 
-Echo_message "Begin mounting /sys..."
+Echo_message "Begin mounting /dev/pts..."
 
 # Requiring stage file
 Require_stagefile .stage/bootstrap
@@ -44,7 +44,7 @@ Require_stagefile .stage/bootstrap
 case "${1}" in
 	install)
 		# Checking stage file
-		Check_stagefile .stage/chroot_sysfs
+		Check_stagefile .stage/chroot_devpts
 
 		# Checking lock file
 		Check_lockfile .lock
@@ -52,14 +52,14 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Create mountpoint
-		mkdir -p chroot/sys
+		# Creating mountpoint
+		mkdir -p chroot/dev/pts
 
-		# Mounting /sys
-		${LH_ROOT_COMMAND} mount sysfs-live -t sysfs chroot/sys
+		# Mounting /dev/pts
+		${LH_ROOT_COMMAND} mount devpts-live -t devpts chroot/dev/pts
 
 		# Creating stage file
-		Create_stagefile .stage/chroot_sysfs
+		Create_stagefile .stage/chroot_devpts
 		;;
 
 	remove)
@@ -69,12 +69,11 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Unmounting /sys
-		#fuser -km chroot/sys
-		${LH_ROOT_COMMAND} umount chroot/sys > /dev/null 2>&1
+		# Unmounting /dev/pts
+		${LH_ROOT_COMMAND} umount chroot/dev/pts > /dev/null 2>&1
 
 		# Removing stage file
-		rm -f .stage/chroot_sysfs
+		rm -f .stage/chroot_devpts
 		;;
 
 	*)

-- 
debian-live/live-helper