summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Schmelzer2008-11-14 19:27:44 +0100
committerSebastian Schmelzer2008-11-14 19:27:44 +0100
commitbdbfc4b2b1088c6e54699f8dd006257796ebc9fc (patch)
treed296bcd2a206bd7f1ebb65a8cea4af0c80a3b802
parent * added ubuntu 8.10 support (diff)
downloadcore-bdbfc4b2b1088c6e54699f8dd006257796ebc9fc.tar.gz
core-bdbfc4b2b1088c6e54699f8dd006257796ebc9fc.tar.xz
core-bdbfc4b2b1088c6e54699f8dd006257796ebc9fc.zip
* change session path order to make sure our default.desktop file
is the first to be found git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2383 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm2
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Suse_10_2.pm2
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm4
3 files changed, 4 insertions, 4 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
index d9f76f55..45c8548a 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
@@ -69,7 +69,7 @@ sub GDMConfigHashForWorkstation
my $configHash = $self->SUPER::GDMConfigHashForWorkstation();
$configHash->{'daemon'}->{SessionDesktopDir} =
- '/usr/share/xsessions/:/etc/X11/sessions/';
+ '/etc/X11/sessions/:/usr/share/xsessions/';
$configHash->{'daemon'}->{Greeter} =
'/usr/lib/gdm/gdmgreeter';
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse_10_2.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse_10_2.pm
index 5b279a5e..aef62fb1 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse_10_2.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse_10_2.pm
@@ -44,7 +44,7 @@ sub GDMConfigHashForWorkstation
my $configHash = $self->SUPER::GDMConfigHashForWorkstation();
$configHash->{'daemon'}->{SessionDesktopDir} =
- '/usr/share/xsessions/:/etc/X11/sessions/';
+ '/etc/X11/sessions/:/usr/share/xsessions/';
return $configHash;
}
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index 0e22d4f1..f3879721 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -84,7 +84,7 @@ sub GDMConfigHashForWorkstation
my $configHash = $self->SUPER::GDMConfigHashForWorkstation();
$configHash->{'daemon'}->{SessionDesktopDir} =
- '/usr/share/gdm/BuiltInSessions/:/usr/share/xsessions/:/etc/X11/sessions/';
+ '/etc/X11/sessions/:/usr/share/xsessions/:/usr/share/gdm/BuiltInSessions/';
return $configHash;
}
@@ -100,7 +100,7 @@ sub KDMConfigHashForWorkstation
$configHash->{'X-:0-Core'}->{Session} = '/etc/kde3/kdm/Xsession';
$configHash->{'X-:0-Core'}->{Reset} = '/etc/kde3/kdm/Xreset';
$configHash->{'X-:0-Core'}->{SessionsDirs} =
- '/usr/share/xsessions,/usr/share/apps/kdm/sessions,/etc/X11/sessions';
+ '/etc/X11/sessions,/usr/share/xsessions,/usr/share/apps/kdm/sessions'
return $configHash;
}