diff -Nru user-setup-1.63ubuntu3/debian/changelog user-setup-1.63ubuntu4/debian/changelog --- user-setup-1.63ubuntu3/debian/changelog 2016-04-18 20:00:34.000000000 +0000 +++ user-setup-1.63ubuntu4/debian/changelog 2016-04-20 14:53:01.000000000 +0000 @@ -1,3 +1,10 @@ +user-setup (1.63ubuntu4) xenial; urgency=medium + + * Fix sddm.conf paths when replacing PLACEHOLDER for the DE to be run by + SDDM in the autologin case. (LP: #1543197) + + -- Mathieu Trudel-Lapierre Wed, 20 Apr 2016 10:52:59 -0400 + user-setup (1.63ubuntu3) xenial; urgency=medium * Fix paths for GDM configs which are now in /etc/gdm3. (LP: #1571415) diff -Nru user-setup-1.63ubuntu3/user-setup-apply user-setup-1.63ubuntu4/user-setup-apply --- user-setup-1.63ubuntu3/user-setup-apply 2016-04-18 19:58:30.000000000 +0000 +++ user-setup-1.63ubuntu4/user-setup-apply 2016-04-20 14:49:34.000000000 +0000 @@ -314,14 +314,14 @@ Session=PLACEHOLDER EOF if $chroot $ROOT [ -f /usr/share/xsessions/plasma.desktop ]; then - sed -i 's/PLACEHOLDER/plasma.desktop/' /etc/sddm.conf + sed -i 's/PLACEHOLDER/plasma.desktop/' $ROOT/etc/sddm.conf elif $chroot $ROOT [ -f /usr/share/xsessions/Lubuntu.desktop ]; then - sed -i 's/PLACEHOLDER/Lubuntu.desktop/' /etc/sddm.conf + sed -i 's/PLACEHOLDER/Lubuntu.desktop/' $ROOT/etc/sddm.conf elif $chroot $ROOT [ -f /usr/share/xsessions/lxqt.desktop ]; then - sed -i 's/PLACEHOLDER/lxqt.desktop/' /etc/sddm.conf + sed -i 's/PLACEHOLDER/lxqt.desktop/' $ROOT/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 + sed -i "s/PLACEHOLDER/$SDDMSESSION/" $ROOT/etc/sddm.conf fi fi if $chroot $ROOT [ -d /etc/lightdm ]; then