summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-08-03 17:09:08 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-08-13 00:52:39 +0200
commit48d671fb199596465520ff9ba0136f9ecdb8326a (patch)
treeb22f51418468f786f9b963f464aaa0f2c19d1849
parentd72df37ce84c0fc006c141fb5f44a7034a69f427 (diff)
downloaddrakx-48d671fb199596465520ff9ba0136f9ecdb8326a.tar
drakx-48d671fb199596465520ff9ba0136f9ecdb8326a.tar.gz
drakx-48d671fb199596465520ff9ba0136f9ecdb8326a.tar.bz2
drakx-48d671fb199596465520ff9ba0136f9ecdb8326a.tar.xz
drakx-48d671fb199596465520ff9ba0136f9ecdb8326a.zip
SDDM wants to get the real session name
instead of symbolic Name LXDE/WindowMaker will need exceptions too
-rw-r--r--perl-install/any.pm11
1 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 4615f2b74..d0e63cf03 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -666,6 +666,15 @@ sub setupBootloader__grub2 {
}
}
+sub adapt_desktop_for_plasma {
+ my ($desktop) = @_;
+ my %h = (
+ 'Plasma' => '01plasma',
+ 'GNOMEClassic' => 'gnome-classic',
+ );
+ $h{$desktop} ? $h{$desktop} . '.desktop' : lc("${desktop}.desktop");
+}
+
sub get_autologin() {
my %desktop = getVarsFromSh("$::prefix/etc/sysconfig/desktop");
my $gdm_file = "$::prefix/etc/X11/gdm/custom.conf";
@@ -728,7 +737,7 @@ sub set_autologin {
#- Configure SDDM
my $sddm_conffile = "$::prefix/etc/sddm.conf";
eval { common::update_gnomekderc_no_create($sddm_conffile, 'Autologin' => (
- Session => $autologin->{desktop},
+ Session => adapt_desktop_for_plasma($autologin->{desktop}),
User => $autologin->{user},
)) } if -e $sddm_conffile;