[SCM] live-config branch, debian-next, updated. debian/2.0_a13-1-13-g6efe308

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 6cea24ba216d651e3bcc530d270afdfc8f93f91d
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jul 16 01:37:19 2010 +0200

    Adding live-config.noautologin parameter to disable both console and graphical autologin.

diff --git a/scripts/config.sh b/scripts/config.sh
index f3e0d3d..667d4ad 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -124,7 +124,14 @@ Cmdline ()
 				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sudo,policykit"
 				;;
 
+			live-config.noautologin|noautologin)
+				# Disables both console and graphical autologin.
+				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
+				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit,gdm,gdm3,kdm,lxdm,nodm,slim"
+				;;
+
 			live-config.nottyautologin|nottyautologin)
+				# Disables console autologin.
 				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
 				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sysvinit"
 				;;

-- 
live-config