diff -Nru user-setup-1.48ubuntu5/debian/changelog user-setup-1.48ubuntu6/debian/changelog --- user-setup-1.48ubuntu5/debian/changelog 2015-04-16 18:37:09.000000000 +0000 +++ user-setup-1.48ubuntu6/debian/changelog 2015-08-18 05:01:46.000000000 +0000 @@ -1,3 +1,12 @@ +user-setup (1.48ubuntu6) wily; urgency=medium + + * Update autologin LightDM confgiguration to used [Seat:*] sections instead of + deprecated [SeatDefaults] + * Fix autologin LightDM confgiguration to not set innapropriate setting + autologin-session to an invalid value (LP: #1484083) + + -- Robert Ancell Tue, 18 Aug 2015 17:00:03 +1200 + user-setup (1.48ubuntu5) vivid; urgency=medium * Fix typo in previous upload: AutomaticLogin line for gdm was containing diff -Nru user-setup-1.48ubuntu5/user-setup-apply user-setup-1.48ubuntu6/user-setup-apply --- user-setup-1.48ubuntu5/user-setup-apply 2015-04-16 18:36:59.000000000 +0000 +++ user-setup-1.48ubuntu6/user-setup-apply 2015-08-18 04:59:44.000000000 +0000 @@ -329,13 +329,12 @@ LightDMCustomFile=$ROOT/etc/lightdm/lightdm.conf AutologinParameters="autologin-guest=false\n\ autologin-user=$USER\n\ -autologin-user-timeout=0\n\ -autologin-session=lightdm-autologin" +autologin-user-timeout=0" if ! grep -qs '^autologin-user' $LightDMCustomFile; then - if ! grep -qs '^\[SeatDefaults\]' $LightDMCustomFile; then - echo '[SeatDefaults]' >> $LightDMCustomFile + if ! grep -qs '^\[Seat:*\]' $LightDMCustomFile; then + echo '[Seat:*]' >> $LightDMCustomFile fi - sed -i "s/\[SeatDefaults\]/\[SeatDefaults\]\n$AutologinParameters/" $LightDMCustomFile + sed -i "s/\[Seat:*\]/\[Seat:*\]\n$AutologinParameters/" $LightDMCustomFile #oem config scenario else sed -i "s/^\(\(str *\)\?autologin-user\)=.*$/\1=$USER/g;" $ROOT/etc/lightdm/lightdm.conf