summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2019-05-03 18:29:14 +0300
committerJani Välimaa <wally@mageia.org>2019-05-03 18:29:14 +0300
commit50df2cdb90877c57baeb03aaf6da2c8fd9a833f9 (patch)
tree3e42fd662cb7c39da29fe8c24777f30dee349491
parentef82e7af027b2bc3ea156bbef6c523a244eca9a1 (diff)
downloaddrakx-50df2cdb90877c57baeb03aaf6da2c8fd9a833f9.tar
drakx-50df2cdb90877c57baeb03aaf6da2c8fd9a833f9.tar.gz
drakx-50df2cdb90877c57baeb03aaf6da2c8fd9a833f9.tar.bz2
drakx-50df2cdb90877c57baeb03aaf6da2c8fd9a833f9.tar.xz
drakx-50df2cdb90877c57baeb03aaf6da2c8fd9a833f9.zip
drakautologin: add session support for lightdm
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/any.pm13
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