[SCM] live-config branch, debian-next, updated. debian/3.0_a29-1-4-gb6fcfcb

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 31b804737c7dd0c93b52795ec5ab0686c1808fa7
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Oct 28 12:24:20 2011 +0200

    Moving comment about mingetty to the actual executed code for consistency.

diff --git a/scripts/config/018-upstart b/scripts/config/018-upstart
index 019b04d..e4fb96d 100755
--- a/scripts/config/018-upstart
+++ b/scripts/config/018-upstart
@@ -38,9 +38,9 @@ Configure_upstart ()
 	do
 		_TTY="$(basename ${_FILE} .conf)"
 
-		# mingetty has autologin support
 		if [ -e /sbin/mingetty ] || grep -qs '^exec.*mingetty' "${_FILE}"
 		then
+			# mingetty has autologin support
 			sed -i -e 's|^\(exec.*getty\) *\(--autologin *[^ ]* *\)*.*$|exec /sbin/mingetty --autologin '"${LIVE_USERNAME} ${_TTY}|g" "${_FILE}"
 		else
 			# substitute getty with a direct login

-- 
live-config