Merge lp:~darkxst/user-setup/noTimedLogin into lp:~ubuntu-core-dev/user-setup/ubuntu

[Tim Lunn]

There is no reason to set TimedLogin under gdm, for automatic logins, maybe these were broken at some point in GNOME2 days and required both settings but thats not the case for a long time. Further there is no UI in GNOME 3 to disable TimedLogin, so we really don't want it set. Right now anyone who selects Auto Login in ubiquity will need to manually edit config files to disable the TimedLogin

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good to me, approved.

review: Approve

[Dimitri John Ledkov (xnox)]

What about Ubuntu Mate? Does that still use GNOME2 stuff that needs TimedLogin?

[Tim Lunn (darkxst)]

Ubuntu Mate are using LightDM, not gdm, so I don't see anyway this could affect them.

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-16 12:56:09 +0000
+++ debian/changelog	2015-04-14 22:04:23 +0000
@@ -1,3 +1,10 @@
+user-setup (1.48ubuntu4) vivid; urgency=medium
+
+  * Don't set TimedLogin, this gets set when Auto login is selected
+    in ubiquity but there is no UI to unset it (LP: #1412791)
+
+ -- Tim Lunn <[e-mail]>  Tue, 14 Apr 2015 17:44:33 +1000
+
 user-setup (1.48ubuntu3) utopic; urgency=medium
 
   [ KDEUSER56 / Rohan Garg ]

=== modified file 'user-setup-apply'
--- user-setup-apply	2014-09-16 12:55:05 +0000
+++ user-setup-apply	2015-04-14 22:04:23 +0000
@@ -266,15 +266,12 @@
 					cp "$GDMCustomFile" "${GDMCustomFile}$BACKUP"
 				fi
 				AutologinParameters="AutomaticLoginEnable=true\n\
-AutomaticLogin=$USER\n\
-TimedLoginEnable=true\n\
-TimedLogin=$USER\n\
-TimedLoginDelay=10"
+AutomaticLogin=$USER\n\"
 
 				# Prevent from updating if parameters already present (persistent usb key)
 				if ! `grep -qs "AutomaticLogin=$USER" $GDMCustomFile` ; then
 					if [ -e "$GDMCustomFile" ]; then
-						sed -i '/\(Automatic\|Timed\)Login/d' $GDMCustomFile
+						sed -i '/\(Automatic\)Login/d' $GDMCustomFile
 					fi
 					if ! `grep -qs '\[daemon\]' $GDMCustomFile` ; then
 						echo '[daemon]' >> $GDMCustomFile