* intermediate check-in of recent work at the desktop plugin - GDM handling

  now seems to work with SUSE and Ubuntu, but proper integration will have
  to wait until I have shaken off the flu


git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1752 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 19 insertions, 4 deletions

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
index 2c3818cd..99d8dc70 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
@@ -26,14 +26,29 @@ use OpenSLX::Utils;
 ### interface methods
 ################################################################################
 
-sub GDMRunlevelLinks
+sub GDMPathInfo
+{
+    my $self = shift;
+    
+    my $pathInfo = $self->SUPER::GDMPathInfo();
+    
+    # link gdm.conf-custom instead of gdm.conf
+    $pathInfo->{config} = '/etc/X11/gdm/gdm.conf-custom';
+
+    return $pathInfo;
+}
+
+sub patchGDMScript
 {
     my $self   = shift;
+    my $script = shift;
     
-    return unshiftHereDoc(<<"    End-of-Here");
-        rllinker earlygdm 1 15
-        rllinker xdm      15 1
+    $script .= unshiftHereDoc(<<'    End-of-Here');
+        rllinker xdm 1 1
+        sed -i 's/DISPLAYMANAGER=.*/DISPLAYMANAGER="gdm"/' \
+            /mnt/etc/sysconfig/displaymanager
     End-of-Here
+    return $script;
 }
 
 1;