summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk von Suchodoletz2010-03-11 22:25:51 +0100
committerDirk von Suchodoletz2010-03-11 22:25:51 +0100
commit2bfcd85894aecabd387062bab27627b14f080581 (patch)
treed78587d8e15e3270c7356dd6816bd66297955926
parentDesktop plugin for Ubuntu (10.04) needs to be changed ... (see #676) (diff)
downloadcore-2bfcd85894aecabd387062bab27627b14f080581.tar.gz
core-2bfcd85894aecabd387062bab27627b14f080581.tar.xz
core-2bfcd85894aecabd387062bab27627b14f080581.zip
Config hash for reduced option set of gdm custom.conf see #676. (more
stuff needs to be changed for Ubuntu 10.04)
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm22
1 files changed, 17 insertions, 5 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index 0e2bc888..14f56b48 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -96,11 +96,23 @@ sub GDMConfigHashForWorkstation
{
my $self = shift;
- my $configHash = $self->SUPER::GDMConfigHashForWorkstation();
- $configHash->{'daemon'}->{SessionDesktopDir} =
- '/etc/X11/session/:/usr/share/xsessions/:/usr/share/gdm/BuiltInSessions/';
-
- return $configHash;
+ return {
+ 'chooser' => {
+ Multicast => 'false',
+ },
+ 'daemon' => {
+ AutomaticLoginEnable => 'false',
+ Group => 'gdm',
+ User => 'gdm',
+ DefaultSession => 'default.desktop',
+ },
+ 'security' => {
+ DisallowTCP => 'true',
+ },
+ 'xdmcp' => {
+ Enable => 'false',
+ },
+ };
}
sub KDMConfigHashForWorkstation