summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorNicolas Salguero <nicolas.salguero@laposte.net>2016-12-01 16:37:34 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-12-01 16:38:04 +0100
commitb2b7472f3279ce50c5be7590522715782ad4313c (patch)
tree19aa3749f7d685ecc2975d5cfb2028d7b8c1a164 /perl-install
parent91b8b41eee598e64576e8506a77d7922eeb867e4 (diff)
downloaddrakx-b2b7472f3279ce50c5be7590522715782ad4313c.tar
drakx-b2b7472f3279ce50c5be7590522715782ad4313c.tar.gz
drakx-b2b7472f3279ce50c5be7590522715782ad4313c.tar.bz2
drakx-b2b7472f3279ce50c5be7590522715782ad4313c.tar.xz
drakx-b2b7472f3279ce50c5be7590522715782ad4313c.zip
allow disabling autologin on LXDM (mga#17616)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/any.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 886bf0296..4202689dd 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakedm:
+ o allow disabling autologin on LXDM (mga#17616)
+
Version 17.60 - 15 November 2016
- diskdrake:
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 093994aed..2c4f421de 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -763,7 +763,7 @@ sub set_autologin {
#- Configure LXDM
my $lxdm_conffile = "$::prefix/etc/lxdm/lxdm.conf";
eval { update_gnomekderc($lxdm_conffile, 'base' => (
- if_($autologin->{user}, 'autologin' => '@' . $autologin->{user})
+ 'autologin' => $autologin->{user} ? '@' . $autologin->{user} : ''
));
if ($autologin->{user} && $autologin->{desktop} && !member($autologin->{desktop}, qw(default failsafe))) {
my $xsession_file = find {