From 183ef8a01141e7c4220a43c63d095dff54b11d5d Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 10 Mar 2010 21:20:54 +0100
Subject: Desktop plugin for Ubuntu (10.04) needs to be changed ... (see #676)

---
 os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'os-plugins')

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index 12b6f14c..0e2bc888 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -33,7 +33,7 @@ sub GDMPathInfo
     my $pathInfo = $self->SUPER::GDMPathInfo();
 
     # link gdm.conf-custom instead of gdm.conf
-    $pathInfo->{config} = '/etc/gdm/gdm.conf-custom';
+    $pathInfo->{config} = '/etc/gdm/custom.conf';
 
     return $pathInfo;
 }
@@ -60,6 +60,7 @@ sub setupGDMScript
         # gdm should be started via upstart mechanism
         mv /mnt/etc/init.inactive/gdm.conf /mnt/etc/init
         echo '/usr/sbin/gdm' >/mnt/etc/X11/default-display-manager
+        # possible to do this directly?
         chroot /mnt update-alternatives --set x-window-manager /usr/bin/metacity
         chroot /mnt update-alternatives --set x-session-manager \
           /usr/bin/gnome-session
@@ -67,8 +68,8 @@ sub setupGDMScript
         rm -rf /mnt/var/lib/gdm
         mkdir -m 1770 /mnt/var/lib/gdm
         chown root:gdm /mnt/var/lib/gdm
-        sed '/^\\[daemon\\]/ a\\BaseXsession=/etc/gdm/Xsession' \
-          -i /mnt$configFile
+        #sed '/^\\[daemon\\]/ a\\BaseXsession=/etc/gdm/Xsession' \
+        #  -i /mnt$configFile
     End-of-Here
 
     return $script;
@@ -79,10 +80,9 @@ sub KDMPathInfo
     my $self = shift;
 
     my $pathInfo = $self->SUPER::KDMPathInfo();
-    my $kdmVer = "4";
 
     $pathInfo = {
-        config => "/etc/kde$kdmVer/kdm/kdmrc",
+        config => "/etc/kde4/kdm/kdmrc",
         paths => [
             '/var/lib/kdm',
             '/var/run/kdm',
-- 
cgit v1.2.3-55-g7522