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

[Jörn Schönyan]

Please review my fix for the SDDM autologin when something else as Plasma desktop is used. It checks for plasma.desktop, Lubuntu.desktop and lxqt.desktop in /usr/share/xsessions and falls back to the first found .desktop file if none of them exist. Thank you very much!

[Mathieu Trudel-Lapierre (cyphermox)]

Is there a bug for this issue? It seems to me like this would be easier to track with a bug report; which could be closed in changelog at the same time.

review: Needs Information

[Jörn Schönyan (joern-schoenyan)]

Hi Mathieu,

I've opened a bug at https://bugs.launchpad.net/ubuntu/+source/user-setup/+bug/1423103

[Jörn Schönyan (joern-schoenyan)]

Any news on this?

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine, I will merge this now.

review: Approve

=== modified file 'user-setup-apply'
--- user-setup-apply	2014-09-16 12:55:05 +0000
+++ user-setup-apply	2015-02-11 12:04:46 +0000
@@ -310,12 +310,22 @@
 			fi
 
 			if $chroot $ROOT [ -f /usr/bin/sddm ]; then
-				# Configure SDDM autologin with plasma 5 session
+				# Configure SDDM autologin with an appropiate session
 				$log $chroot $ROOT /bin/sh -c "cat > /etc/sddm.conf" << EOF
 [Autologin]
 User=$USER
-Session=plasma.desktop
+Session=PLACEHOLDER
 EOF
+				if $chroot $ROOT [ -f /usr/share/xsessions/plasma.desktop ]; then
+					sed -i 's/PLACEHOLDER/plasma.desktop/' /etc/sddm.conf
+				elif $chroot $ROOT [ -f /usr/share/xsessions/Lubuntu.desktop ]; then
+					sed -i 's/PLACEHOLDER/Lubuntu.desktop/' /etc/sddm.conf
+				elif $chroot $ROOT [ -f /usr/share/xsessions/lxqt.desktop ]; then
+					sed -i 's/PLACEHOLDER/lxqt.desktop/' /etc/sddm.conf
+				else #fallback if some other DE/WM is used
+					SDDMSESSION=$(ls /usr/share/xsessions | head -1)
+					sed -i "s/PLACEHOLDER/$SDDMSESSION/" sddm.conf
+				fi
 			fi
 			if $chroot $ROOT [ -d /etc/lightdm ]; then
 				# Configure LightDM autologin