diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-02-29 23:51:21 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-03-01 00:12:50 +0000 |
| commit | d56017ae49065e32781579ba09c27301265382e4 (patch) | |
| tree | 58864733d31b18736ebb14a6ee564b1cb8d34e94 | |
| parent | 8fe19c7840073f412fd6298bc3033dc28df4484b (diff) | |
| download | drakiso-d56017ae49065e32781579ba09c27301265382e4.tar drakiso-d56017ae49065e32781579ba09c27301265382e4.tar.gz drakiso-d56017ae49065e32781579ba09c27301265382e4.tar.bz2 drakiso-d56017ae49065e32781579ba09c27301265382e4.tar.xz drakiso-d56017ae49065e32781579ba09c27301265382e4.zip | |
Support separate desktop and autologin session names.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | examples/xfce/config/settings.cfg | 1 | ||||
| -rw-r--r-- | lib/MGA/DrakISO/BuildRoot.pm | 6 |
3 files changed, 5 insertions, 3 deletions
@@ -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 => [", |