Merge lp:~gilir/user-setup/lp-546445 into lp:~ubuntu-core-dev/user-setup/ubuntu

[Julien Lavergne]

Add auto-login support when lxdm is installed

[Colin Watson (cjwatson)]

Makes sense - thanks a lot! Merging.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-04 11:41:38 +0000
+++ debian/changelog	2010-11-22 20:29:42 +0000
@@ -1,3 +1,9 @@
+user-setup (1.28ubuntu11) UNRELEASED; urgency=low
+
+  * Add support for autologin when lxdm is installed (LP: #546445)
+
+ -- Julien Lavergne <[e-mail]>  Mon, 22 Nov 2010 19:56:37 +0100
+
 user-setup (1.28ubuntu10) maverick; urgency=low
 
   * Fix syntax error introduced in 1.28ubuntu9.

=== modified file 'user-setup-apply'
--- user-setup-apply	2010-10-04 11:40:47 +0000
+++ user-setup-apply	2010-11-22 20:29:42 +0000
@@ -275,6 +275,24 @@
 					-e "s/^#?AutoReLogin=.*\$/AutoReLogin=true/" \
 					/etc/kde4/kdm/kdmrc
 			fi
+
+			if $chroot $ROOT [ -f /etc/lxdm/lxdm.conf ]; then
+    				# Configure LXDM autologin with LXDE session
+   				$log $chroot $ROOT sed -i$BACKUP -r \
+        				-e "s/^# autologin=dgod/autologin=$USER/" \
+        				-e "s/^# session/session/" \
+        				/etc/lxdm/lxdm.conf
+			fi
+
+			if $chroot $ROOT [ -f /etc/xdg/lubuntu/lxdm/lxdm.conf ]; then
+    				# Configure LXDM autologin with Lubuntu session
+				$log $chroot $ROOT sed -i$BACKUP -r \
+			        	-e "s/^# autologin=dgod/autologin=$USER/" \
+			        	-e "s/^# session/session/" \
+			        	-e "s/startlxde/startlubuntu/" \
+			        	/etc/xdg/lubuntu/lxdm/lxdm.conf
+			fi
+
 		fi
 	fi