From d56017ae49065e32781579ba09c27301265382e4 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 29 Feb 2020 23:51:21 +0000
Subject: Support separate desktop and autologin session names.

---
 NEWS                              | 1 +
 examples/xfce/config/settings.cfg | 1 +
 lib/MGA/DrakISO/BuildRoot.pm      | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 171338f..3d4d132 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 - update examples to support encrypted persistent partition
+- support separate desktop and autologin session names
 
 1.11
 
diff --git a/examples/xfce/config/settings.cfg b/examples/xfce/config/settings.cfg
index 99d9ed0..cada684 100644
--- a/examples/xfce/config/settings.cfg
+++ b/examples/xfce/config/settings.cfg
@@ -5,6 +5,7 @@ desktop=Xfce
 release=7
 arch=x86_64
 region=all
+default_session=XfceSession
 default_user=live
 repository=http://mirrors.kernel.org/mageia/distrib/7
 workdir=
diff --git a/lib/MGA/DrakISO/BuildRoot.pm b/lib/MGA/DrakISO/BuildRoot.pm
index b4078d9..7c685e0 100644
--- a/lib/MGA/DrakISO/BuildRoot.pm
+++ b/lib/MGA/DrakISO/BuildRoot.pm
@@ -214,7 +214,7 @@ sub write_auto_inst_cfg {
     my $exclude_packages    = $build->{system}{exclude_packages};
     my $preferred_packages  = $build->{system}{preferred_packages};
     my $local_repo_packages = $build->{system}{local_repo_packages};
-    my @desktops            = split(/\|/, $build->{settings}{desktop});
+    my $default_session     = $build->{settings}{default_session};
     my $default_user        = $build->{settings}{default_user};
     my $post_install_nr     = $build->{system}{post_install_nr};
     my $post_install        = $build->{system}{post_install};
@@ -280,8 +280,8 @@ sub write_auto_inst_cfg {
     ) if $preferred_packages;
     push @text, (
         "    meta_class => 'desktop',",
-        "    desktop => '$desktops[0]',",
-    ) if @desktops;
+        "    desktop => '$default_session',",
+    ) if $default_session;
     push @text, (
         "    autologin => '$default_user',",
         "    users => [",
-- 
cgit v1.2.1