From 50df2cdb90877c57baeb03aaf6da2c8fd9a833f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jani=20V=C3=A4limaa?= <wally@mageia.org>
Date: Fri, 3 May 2019 18:29:14 +0300
Subject: drakautologin: add session support for lightdm

---
 perl-install/NEWS   |  1 +
 perl-install/any.pm | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 17b2453f9..85878adea 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- drakautologin: add session support for lightdm
 - update list of modules needing firmware
 
 Version 18.15 - 3 May 2019
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 968d03327..96d201565 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -841,9 +841,18 @@ sub set_autologin {
 
     #- Configure LIGHTDM
     my $lightdm_conffile = "$::prefix/etc/lightdm/lightdm.conf.d/50-mageia-autologin.conf";
+    my $xsession_file = find {
+        my %xsession = read_gnomekderc($_, 'Desktop Entry');
+        $xsession{Name} =~ s/\s+//g;
+        $xsession{Name} eq $autologin->{desktop};
+    } glob("$::prefix/usr/share/xsessions/*.desktop");
+    $xsession_file =~ s!\.[^.]+$!!;
+    $xsession_file =~ s!.*/!!;
+    $xsession_file ||= $autologin->{desktop};
     eval { update_gnomekderc($lightdm_conffile, 'Seat:*' => (
-	'#dummy-autologin' => $do_autologin,
-	'autologin-user' => $autologin->{user}
+        '#dummy-autologin' => $do_autologin,
+        'autologin-user' => $autologin->{user},
+        'autologin-session' => $xsession_file,
     )) } if -e $lightdm_conffile;
 
     #- Configure LXDM
-- 
cgit v1.2.1