* adjusted config-path for kdmrc as needed

* implemented support for switching to the requested session- and window-manager
When I tested this with my local Ubuntu-8.04, it does what is expected, but seemingly that's still not enough, as all I get is still an xterm only.


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

2 files changed, 19 insertions, 2 deletions

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
index dbd12416..da1f0359 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
@@ -147,7 +147,7 @@ sub setupGDMScript
 
         mkdir -p $paths 2>/dev/null
 
-        cp /mnt/$repoPath/gdm/\$desktop_mode/gdm.conf /mnt$configFile
+        cp /mnt$repoPath/gdm/\$desktop_mode/gdm.conf /mnt$configFile
 
         # activate theme only if the corresponding xml file is found
         # (otherwise fall back to default theme of vendor-OS)
@@ -293,7 +293,7 @@ sub setupKDMScript
 
         mkdir -p $paths 2>/dev/null
 
-        cp /mnt/$repoPath/kdm/\$desktop_mode/kdmrc /mnt$configFile
+        cp /mnt$repoPath/kdm/\$desktop_mode/kdmrc /mnt$configFile
 
         # activate theme only if the corresponding xml file is found
         # (otherwise fall back to default theme of vendor-OS)
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index 59f77f52..7df3825c 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -48,11 +48,25 @@ sub setupGDMScript
     $script .= unshiftHereDoc(<<'    End-of-Here');
         rllinker gdm 1 1
         echo '/usr/sbin/gdm' > /mnt/etc/X11/default-display-manager
+        chroot /mnt update-alternatives --set x-window-manager /usr/bin/metacity
+        chroot /mnt update-alternatives --set x-session-manager \
+          /usr/bin/gnome-session
     End-of-Here
 
     return $script;
 }
 
+sub KDMPathInfo
+{
+    my $self = shift;
+    
+    my $pathInfo = $self->SUPER::KDMPathInfo();
+    
+    $pathInfo->{config} = '/etc/kde3/kdm/kdmrc';
+
+    return $pathInfo;
+}
+
 sub setupKDMScript
 {
     my $self     = shift;
@@ -63,6 +77,9 @@ sub setupKDMScript
     $script .= unshiftHereDoc(<<'    End-of-Here');
         rllinker kdm 1 1
         echo '/usr/bin/kdm' > /mnt/etc/X11/default-display-manager
+        chroot /mnt update-alternatives --set x-window-manager /usr/bin/kwin
+        chroot /mnt update-alternatives --set x-session-manager \
+          /usr/bin/startkde
     End-of-Here
 
     return $script;