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

[Rohan Garg]

SDDM Support

[Colin Watson (cjwatson)]

The here-doc inside the quotes kind of confuses me; not that I'm saying it doesn't work, but it certainly requires thought. How about this structure instead:

  $log $chroot $ROOT /bin/sh -c "cat > /etc/sddm.conf" <<EOF
[Autologin]
...
EOF

[lp:~rohangarg/user-setup/ubuntu]

281. By Rohan Garg on 2014-09-16

Structure the code a bit better

[Rohan Garg (rohangarg)]

Fixed with r281

[Colin Watson (cjwatson)]

LGTM now, thanks!

review: Approve

=== modified file 'user-setup-apply'
--- user-setup-apply	2012-10-15 09:35:42 +0000
+++ user-setup-apply	2014-09-16 12:46:52 +0000
@@ -309,6 +309,14 @@
 			        	/etc/xdg/lubuntu/lxdm/lxdm.conf
 			fi
 
+                        if $chroot $ROOT [ -f /usr/bin/sddm ]; then
+                                # Configure SDDM autologin with plasma 5 session
+                                $log $chroot $ROOT /bin/sh -c "cat > /etc/sddm.conf" << EOF
+[Autologin]
+User=$USER
+Session=plasma.desktop
+EOF
+                        fi
 			if $chroot $ROOT [ -d /etc/lightdm ]; then
 				# Configure LightDM autologin
 				LightDMCustomFile=$ROOT/etc/lightdm/lightdm.conf