From 2bfcd85894aecabd387062bab27627b14f080581 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 11 Mar 2010 22:25:51 +0100
Subject: Config hash for reduced option set of gdm custom.conf see #676. (more
 stuff needs to be changed for Ubuntu 10.04)

---
 .../plugins/desktop/OpenSLX/Distro/Ubuntu.pm       | 22 +++++++++++++++++-----
 1 file 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
-- 
cgit v1.2.3-55-g7522