summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2015-09-14 20:03:55 +0300
committerJani Välimaa <wally@mageia.org>2015-09-14 20:03:55 +0300
commit8de8ae5b6204f00af26de2952cc284a3c2e619c7 (patch)
tree855b086261ae7e9a0db13907594076ace3cede0d
parenta34c2311a4523719e92915466a54a1e687dc240b (diff)
downloaddrakx-8de8ae5b6204f00af26de2952cc284a3c2e619c7.tar
drakx-8de8ae5b6204f00af26de2952cc284a3c2e619c7.tar.gz
drakx-8de8ae5b6204f00af26de2952cc284a3c2e619c7.tar.bz2
drakx-8de8ae5b6204f00af26de2952cc284a3c2e619c7.tar.xz
drakx-8de8ae5b6204f00af26de2952cc284a3c2e619c7.zip
drakboot: fix lightdm support after upstream config file change
Upstream changed config file syntax [SeatDefaults] -> [Seat:*].
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/any.pm4
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 376a1a12b..5158066cd 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o fix lightdm support after upstream config file change
+
Version 17.1 - 27 August 2015
- recognize new kernel-4.1 drivers
diff --git a/perl-install/any.pm b/perl-install/any.pm
index c37c444c6..3bd13fceb 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -679,7 +679,7 @@ sub get_autologin() {
my %conf = read_gnomekderc($kdm_file, 'X-:0-Core');
$autologin_user = text2bool($conf{AutoLoginEnable}) && $conf{AutoLoginUser};
} elsif ($dm eq "lightdm") {
- my %conf = read_gnomekderc($lightdm_conffile, 'SeatDefaults');
+ my %conf = read_gnomekderc($lightdm_conffile, 'Seat:*');
$autologin_user = text2bool($conf{'#dummy-autologin'}) && $conf{"autologin-user"};
} else {
my %conf = getVarsFromSh($autologin_file);
@@ -723,7 +723,7 @@ sub set_autologin {
#- Configure LIGHTDM
my $lightdm_conffile = "$::prefix/etc/lightdm/lightdm.conf.d/50-mageia-autologin.conf";
- eval { update_gnomekderc($lightdm_conffile, SeatDefaults => (
+ eval { update_gnomekderc($lightdm_conffile, 'Seat:*' => (
'#dummy-autologin' => $do_autologin,
'autologin-user' => $autologin->{user}
)) } if -e $lightdm_conffile;