summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Tappe2008-06-03 15:00:57 +0200
committerOliver Tappe2008-06-03 15:00:57 +0200
commit98b8445913e590e3319691d4c66c754f3e42e709 (patch)
tree9a3a17792b057a634fa88957e9ea71e3c51e25f9
parent* reorganized the themes-folders of the desktop-plugin as discussed with Michael (diff)
downloadcore-98b8445913e590e3319691d4c66c754f3e42e709.tar.gz
core-98b8445913e590e3319691d4c66c754f3e42e709.tar.xz
core-98b8445913e590e3319691d4c66c754f3e42e709.zip
* added missing override of setupKDMScript() for Debian and Ubuntu, which
is required to force starting of KDM (untested) git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1839 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm14
-rw-r--r--os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm14
2 files changed, 28 insertions, 0 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm
index bb8d2ee5..cbabda87 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm
@@ -41,5 +41,19 @@ sub setupGDMScript
return $script;
}
+sub setupKDMScript
+{
+ my $self = shift;
+ my $repoPath = shift;
+
+ my $script = $self->SUPER::setupKDMScript($repoPath);
+
+ $script .= unshiftHereDoc(<<' End-of-Here');
+ rllinker kdm 1 1
+ echo '/usr/bin/kdm' > /mnt/etc/X11/default-display-manager
+ End-of-Here
+
+ return $script;
+}
1; \ No newline at end of file
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index effd165e..d28b8485 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -53,4 +53,18 @@ sub setupGDMScript
return $script;
}
+sub setupKDMScript
+{
+ my $self = shift;
+ my $repoPath = shift;
+
+ my $script = $self->SUPER::setupKDMScript($repoPath);
+
+ $script .= unshiftHereDoc(<<' End-of-Here');
+ rllinker kdm 1 1
+ echo '/usr/sbin/kdm' > /mnt/etc/X11/default-display-manager
+ End-of-Here
+
+ return $script;
+}
1; \ No newline at end of file