[SCM] live-config branch, debian, updated. debian/2.0.15-1-101-g11311cd

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit b451f1bdacde5ff3cbffe884f8ccfbe0ed85770d
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Mar 25 10:37:22 2011 +0100

    Fixing various things in upstart script.

diff --git a/scripts/config/016-upstart b/scripts/config/016-upstart
index 2a11f2a..d09e420 100755
--- a/scripts/config/016-upstart
+++ b/scripts/config/016-upstart
@@ -24,28 +24,29 @@ Upstart ()
 
 Configure_upstart ()
 {
-	for ttyfile in /etc/init/tty*
+	for _FILE in /etc/init/tty*
 	do
-		ttynum=$(basename "${ttyfile}" .conf)
+		_TTY="$(basename ${_FILE} .conf)"
 
 		# mingetty has autologin support
-		if grep -qs '^exec.*mingetty' || [ -e /sbin/mingetty ]
+		if [ -e /sbin/mingetty ] || grep -qs '^exec.*mingetty' "${_FILE}"
 		then
-			sed -i -e 's|^\(exec.*getty\) *\(--autologin *[^ ]* *\)*.*$|exec /sbin/mingetty --autologin '"${LIVE_USERNAME} ${ttynum}|g" "${ttyfile}"
+			sed -i -e 's|^\(exec.*getty\) *\(--autologin *[^ ]* *\)*.*$|exec /sbin/mingetty --autologin '"${LIVE_USERNAME} ${_TTY}|g" "${_FILE}"
 		else
 			# substitute getty with a direct login
-			sed -i -e 's|^exec.*getty.*$|exec /bin/login -f '"${LIVE_USERNAME} </dev/${ttynum} >/dev/${ttynum} 2>\&1|" "${ttyfile}"
+			sed -i -e 's|^exec.*getty.*$|exec /bin/login -f '"${LIVE_USERNAME} </dev/${_TTY} >/dev/${_TTY} 2>\&1|" "${_FILE}"
 		fi
 	done
 
 	init q
 
-	for ttyfile in /etc/init/tty*
+	for _FILE in /etc/init/tty*
 	do
-		ttynum=$(basename "${ttyfile}" .conf)
-		echo "reload ${ttynum}"
-		stop $ttynum
-		start $ttynum
+		_TTY="$(basename ${_FILE} .conf)"
+
+		# reloading
+		stop ${_TTY}
+		start ${_TTY}
 	done
 
 	# Creating state file

-- 
live-config