diff options
| author | Michael Janczyk | 2010-08-13 21:39:43 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2010-08-13 21:39:43 +0200 |
| commit | cb48b3b91b7ff88c709b4685b56cebe9f5201bc9 (patch) | |
| tree | 7092d14d252ee5bfd741a895c23d15de3f06d97f | |
| parent | Fix to load both modules (modprobe -a ...) in hwautocfg. (diff) | |
| download | core-cb48b3b91b7ff88c709b4685b56cebe9f5201bc9.tar.gz core-cb48b3b91b7ff88c709b4685b56cebe9f5201bc9.tar.xz core-cb48b3b91b7ff88c709b4685b56cebe9f5201bc9.zip | |
kdm is default manager now, gdm no theme support
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm | 6 | ||||
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm index a8c51c1c..96c8c89d 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm @@ -48,9 +48,9 @@ sub getDefaultDesktopManager { my $self = shift; - # the default implementation prefers GDM over KDM over XDM - return $self->isGDMInstalled() ? 'kdm' - : $self->isKDMInstalled() ? 'gdm' + # the default implementation prefers KDM over GDM over XDM + return $self->isKDMInstalled() ? 'kdm' + : $self->isGDMInstalled() ? 'gdm' : $self->isXDMInstalled() ? 'xdm' : undef; } diff --git a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm index 4bd05278..7d496483 100644 --- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm +++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm @@ -508,7 +508,7 @@ sub _ensureSensibleStage3Attrs # one, if it isn't my $manager = $self->{attrs}->{'desktop::manager'} || ''; if (!$self->{$manager}) { - my @managers = map { $self->{$_} ? $_ : () } qw( gdm kdm xdm ); + my @managers = map { $self->{$_} ? $_ : () } qw( kdm gdm xdm ); if (!@managers) { die _tr( "no desktop manager is possible, plugin 'desktop' wouldn't work!" |