1 files changed, 6 insertions, 28 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index fa364b79..12b6f14c 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -57,8 +57,8 @@ sub setupGDMScript
           echo "$USER files removed by $0" >/tmp/files.removed 2>/dev/null ) &
         . /etc/gdm/PostSession/Default.system' >/mnt/etc/gdm/PostSession/Default
         chmod a+x /mnt/etc/gdm/PostSession/Default*
-        # gdm should be started after dbus/hal
-        rllinker gdm 5 10
+        # 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
         chroot /mnt update-alternatives --set x-window-manager /usr/bin/metacity
         chroot /mnt update-alternatives --set x-session-manager \
@@ -74,29 +74,12 @@ sub setupGDMScript
     return $script;
 }
 
-sub KDMVersion
-{
-    my $self = shift;
-    my $vendorOSName = $self->{'engine'}->{'vendor-os-name'};
-
-    my $kdmVer;
-    if ( $vendorOSName =~ /ubuntu-8.04.*/ ) {
-        $kdmVer = "3";
-    }
-    else {
-        $kdmVer = "4";
-    }
-
-    return $kdmVer;
-
-}
-
 sub KDMPathInfo
 {
     my $self = shift;
 
     my $pathInfo = $self->SUPER::KDMPathInfo();
-    my $kdmVer = $self->KDMVersion();
+    my $kdmVer = "4";
 
     $pathInfo = {
         config => "/etc/kde$kdmVer/kdm/kdmrc",
@@ -124,7 +107,7 @@ sub KDMConfigHashForWorkstation
 {
     my $self = shift;
     
-    my $kdmVer = $self->KDMVersion();
+    my $kdmVer = "4";
     my $configHash = $self->SUPER::KDMConfigHashForWorkstation();
     $configHash->{'General'}->{PidFile} = "/var/run/kdm.pid";
     $configHash->{'X-:0-Core'}->{Setup} = "/etc/kde$kdmVer/kdm/Xsetup";
@@ -143,14 +126,9 @@ sub setupKDMScript
     my $self     = shift;
     my $repoPath = shift;
 
-    my $kdmVer = $self->KDMVersion();
+    my $kdmVer = "4";
     my $script = $self->SUPER::setupKDMScript($repoPath);
 
-     # change default theme to openslx-legacy if kdm3
-    if ( $kdmVer == "3" ) {
-        print "  * Please change to openslx-legacy theme when using kdm3\n";
-    }
-
     $script .= "kdmver=$kdmVer\n";
     $script .= unshiftHereDoc(<<'    End-of-Here');
 
@@ -165,7 +143,7 @@ sub setupKDMScript
         . /etc/kde$kdmver/kdm/Xreset.system' >/mnt/etc/kde$kdmver/kdm/Xreset
         chmod a+x /mnt/etc/kde$kdmver/kdm/Xreset*
 
-        rllinker kdm 1 10
+        mv /mnt/etc/init.inactive/kdm.conf /mnt/etc/init
         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 \