From d56017ae49065e32781579ba09c27301265382e4 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 29 Feb 2020 23:51:21 +0000 Subject: Support separate desktop and autologin session names. --- lib/MGA/DrakISO/BuildRoot.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') 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