diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2025-12-27 11:12:39 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2025-12-27 11:41:36 +0000 |
| commit | 1542be849770dcd1644804f2b2a682fe3e0530b7 (patch) | |
| tree | 3268d363287eebe585612c22c5a63d144a003879 /perl-install | |
| parent | e0ef94e95661682bec375632c55dbebfd4f0a24f (diff) | |
| download | drakx-1542be849770dcd1644804f2b2a682fe3e0530b7.tar drakx-1542be849770dcd1644804f2b2a682fe3e0530b7.tar.gz drakx-1542be849770dcd1644804f2b2a682fe3e0530b7.tar.bz2 drakx-1542be849770dcd1644804f2b2a682fe3e0530b7.tar.xz drakx-1542be849770dcd1644804f2b2a682fe3e0530b7.zip | |
Make IceWM the last choice when picking the default session for first boot (mga#34836)
IceWM is automatically installed as a fallback DE. So we want to default
to one of the DEs the user actually chose.
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/any.pm | 5 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index e64a51694..adca9fc33 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,4 @@ +- make IceWM the last choice when automatically choosing the session for autologin - fix inconsistent use of any::sessions() - fix autologin session selection for GDM diff --git a/perl-install/any.pm b/perl-install/any.pm index 9b47bcf56..871aca09a 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -866,7 +866,10 @@ sub get_autologin() { my $lightdm_conffile = "$::prefix/etc/lightdm/lightdm.conf.d/50-mageia-autologin.conf"; my $lxdm_conffile = "$::prefix/etc/lxdm/lxdm.conf"; my $autologin_file = "$::prefix/etc/sysconfig/autologin"; - my $desktop = $desktop{DESKTOP} || first(session_names()); + my @session_names = session_names() if ! $desktop{DESKTOP}; + my $desktop = $desktop{DESKTOP} || + first(grep { $_ !~ /icewm/i } @session_names) || + first(grep { $_ =~ /icewm/i } @session_names); my $dm = basename(readlink("$::prefix/etc/systemd/system/display-manager.service")) =~ s/(.*)\.service/$1/r || desktop_to_dm($desktop) || diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 0685b4ac5..42da08be1 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- make IceWM the last choice when picking the default session for first boot (mga#34836) + Version 18.70 - 29 November 2025 - use POSIX::setlocale() instead of c::setlocale() to ensure Locale::gettext |