diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-11-25 09:44:55 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-11-25 09:44:55 +0000 |
| commit | 63aa10c1a70fbfa9384e8e1cc88a59df080b021e (patch) | |
| tree | 554d6cbb7c69fae3f1ad4b7a233ff082e9022a0e | |
| parent | a587af2c1985e4ca7e93d5d73fe5d75e79535a41 (diff) | |
| download | drakx-63aa10c1a70fbfa9384e8e1cc88a59df080b021e.tar drakx-63aa10c1a70fbfa9384e8e1cc88a59df080b021e.tar.gz drakx-63aa10c1a70fbfa9384e8e1cc88a59df080b021e.tar.bz2 drakx-63aa10c1a70fbfa9384e8e1cc88a59df080b021e.tar.xz drakx-63aa10c1a70fbfa9384e8e1cc88a59df080b021e.zip | |
Check DM really is installed, not just present in /usr/share/X11.dm.d.
The gdm.conf file is in the xinitrc package, so we can't rely on that
to determine whether GDM is available. Even if we fix that, this makes
our test more robust.
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 8cd3ead4c..3da0a013a 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -760,7 +760,7 @@ sub available_dms() { my @l; foreach (glob("$::prefix/usr/share/X11/dm.d/*.conf")) { my %dm = getVarsFromSh($_); - push @l, $dm{EXEC} if $dm{EXEC}; + push @l, $dm{EXEC} if $dm{EXEC} && -x "$::prefix/$dm{EXEC}"; } @l; } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 5ee72f2e8..6074ffbae 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- check DM really is installed, not just present in /usr/share/X11.dm.d + Version 18.6 - 21 Nov 2018 - fix DM preference when none is selected (don't default to XDM) |