[SCM] live-config branch, debian-next, updated. debian/3.0_a24-1-5-ge98ab01

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit c251c1e92b22bc865b016d929b360715935a7e4d
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 22 16:00:21 2011 +0200

    Applying slightly modified patch from Reinhard Tartler <siretart at tauware.de> to add Ubuntu specifics for lxdm autologin configuration.

diff --git a/scripts/config/010-lxdm b/scripts/config/010-lxdm
index 31a8a45..04946a6 100755
--- a/scripts/config/010-lxdm
+++ b/scripts/config/010-lxdm
@@ -32,6 +32,7 @@ Lxdm ()
 
 Configure_lxdm ()
 {
+	# Debian
 	if [ -e /etc/lxdm/lxdm.conf ]
 	then
 		sed -i -r -e "s|^#.*autologin=.*\$|autologin=${LIVE_USERNAME}|" \
@@ -39,6 +40,14 @@ Configure_lxdm ()
 		/etc/lxdm/lxdm.conf
 	fi
 
+	# Ubuntu
+	if [ -e /etc/lxdm/default.conf ]
+	then
+		sed -i -r -e "s|^#.*autologin=.*\$|autologin=${LIVE_USERNAME}|" \
+			  -e "s|^#.*session.*\$|session=/usr/bin/startlubuntu|" \
+		/etc/lxdm/default.conf
+	fi
+
 	# Avoid xinit
 	_X11="true"
 	export _X11

-- 
live-config