From d4cf9227f3bc97977f7cde0b74fa0aa416d36ef4 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 6 Dec 2016 22:53:47 +0000
Subject: Change desktop name from PLASMA5 to Plasma (to match stage2
 installer).

This is needed for any::set_autologin to pick the correct session name.
Also changed $has_plasma5 to $has_plasma to be consistent.
---
 config/auto_inst.cfg.pl | 12 ++++++------
 config/live.cfg         |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 4ef23d4..450b9ef 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -9,7 +9,7 @@ my $distro_release = 'Default';
 my $distro_config = lc($distro_release);
 
 my @desktops = split(/\|/, $ENV{DRAKLIVE_DESKTOP});
-my $has_plasma5 = member('PLASMA5', @desktops);
+my $has_plasma = member('Plasma', @desktops);
 my $has_gnome = member('GNOME', @desktops);
 my $has_xfce = member('xfce4', @desktops);
 my $has_lxde = member('LXDE', @desktops);
@@ -55,7 +55,7 @@ $o = {
                qw(EDITORS TERMINALS TEXT_TOOLS SHELLS FILE_TOOLS),
                # system
                qw(SYSTEM MINIMAL_DOCS X ACCESSIBILITY THEMES),
-               if_($has_plasma5, qw(PLASMA5)),
+               if_($has_plasma, qw(PLASMA5)),
                if_($has_gnome, qw(GNOME)),
                if_($has_xfce, qw(XFCE)),
                if_($has_lxde, qw(LXDE)),
@@ -125,12 +125,12 @@ $o = {
             ),
 
             # Plasma specific stuff
-            if_($has_plasma5,
+            if_($has_plasma,
             ),
        ],
 
        'default_packages' => [
-            if_($has_plasma5, "$distro_config-plasma5-config"),
+            if_($has_plasma, "$distro_config-plasma5-config"),
             if_($has_lxde, "mageia-lxde-config-$distro_release"),
             if_($has_xfce, "mageia-xfce-config-$distro_release"),
 
@@ -169,13 +169,13 @@ $o = {
             ),
 
             # Plasma specific stuff
-            if_($has_plasma5,
+            if_($has_plasma,
         	'task-plasma5', 'sddm', # sometimes gets nuked during build
         	'manatools-qt' # take new tools for a spin
             ),
        ],
 
-       'preferred_packages' => join(',', $has_plasma5 ? 'sddm' : 'gdm'),
+       'preferred_packages' => join(',', $has_plasma ? 'sddm' : 'gdm'),
        'meta_class' => 'desktop',
        'desktop' => first(@desktops),
        if_($ENV{DRAKLIVE_DEFAULT_USER}, 'autologin' => $ENV{DRAKLIVE_DEFAULT_USER}),
diff --git a/config/live.cfg b/config/live.cfg
index 11128de..8cee32f 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -81,7 +81,7 @@ my $_l = {
 	    if_($live->{settings}{desktop} eq 'GNOME',
 		[ 'files/draklive-install.d/run.d/gdm-permissions.sh', '/etc/draklive-install.d/run.d/gdm-permissions.sh', { mode => 755 } ]
 	    ),
-	    if_($live->{settings}{desktop} eq 'PLASMA5',
+	    if_($live->{settings}{desktop} eq 'Plasma',
 		[ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ]
 	    ),
             #- sysconfig files for first boot
@@ -189,7 +189,7 @@ my $_l = {
                             #- adduser seems to create a sparse lastlog with a slot for all available users
                             #- which can be huge
                             '> /var/log/lastlog',
-                            if_($live->{settings}{desktop} eq 'PLASMA5', 
+                            if_($live->{settings}{desktop} eq 'Plasma', 
                                 "rm -f /usr/share/icons/*/icon-theme.cache",
                                 "cp -a /etc/akonadi/mysql-global.conf /etc/akonadi/mysql-global-standard.conf",
                                 "cp /etc/akonadi/mysql-global-mobile.conf /etc/akonadi/mysql-global.conf",
@@ -232,7 +232,6 @@ my $_l = {
 			    "find /usr/share/fonts -type d -exec touch -t \$(date +%Y%m%d%H%M.%S) '{}' ';'",
 			    # now update the cache for the new timestamps
 			    "fc-cache -rf",
-
                         ),
         additional_media => [
           if_($live->{settings}{updates_repository},
-- 
cgit v1.2.1