diff options
| author | Dirk von Suchodoletz | 2008-08-15 00:20:19 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-08-15 00:20:19 +0200 |
| commit | 818c86751e7494eec6bfdf86fd0c5f5fc4fa9b3b (patch) | |
| tree | 78c05f168f14fb5b052f774280b47b1633ebda8d /os-plugins | |
| parent | Problem with the xserver module on SuSE10.2 should be fixed this way. (diff) | |
| download | core-818c86751e7494eec6bfdf86fd0c5f5fc4fa9b3b.tar.gz core-818c86751e7494eec6bfdf86fd0c5f5fc4fa9b3b.tar.xz core-818c86751e7494eec6bfdf86fd0c5f5fc4fa9b3b.zip | |
The kdmrc for Ubuntu needs to be configured for kdm-specific Xorg
scripts (Xsession, Xstartup, ...), variable fix in Base.pm for kdm.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2045 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm | 4 | ||||
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm | 23 |
2 files changed, 23 insertions, 4 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm index fd92a918..a37b42f9 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm @@ -380,8 +380,8 @@ sub KDMConfigHashForKiosk my $self = shift; my $configHash = $self->KDMConfigHashForWorkstation(); - $configHash->{daemon}->{AutoLoginEnable} = 'true'; - $configHash->{daemon}->{AutoLoginUser} = 'nobody'; + $configHash->{'X-:0-Core'}->{AutoLoginEnable} = 'true'; + $configHash->{'X-:0-Core'}->{AutoLoginUser} = 'nobody'; return $configHash; } diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm index e7311ad6..5b1d8db9 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm @@ -67,11 +67,30 @@ sub KDMPathInfo my $pathInfo = $self->SUPER::KDMPathInfo(); - $pathInfo->{config} = '/etc/kde3/kdm/kdmrc'; + $pathInfo = { + config => '/etc/kde3/kdm/kdmrc', + paths => [ + '/var/lib/kdm', + '/var/run/kdm', + ], + }; return $pathInfo; } +sub KDMConfigHashForWorkstation +{ + my $self = shift; + + my $configHash = $self->SUPER::KDMConfigHashForWorkstation(); + $configHash->{'X-:0-Core'}->{Setup} = '/etc/kde3/kdm/Xsetup'; + $configHash->{'X-:0-Core'}->{Startup} = '/etc/kde3/kdm/Xstartup'; + $configHash->{'X-:0-Core'}->{Session} = '/etc/kde3/kdm/Xsession'; + $configHash->{'X-:0-Core'}->{Reset} = '/etc/kde3/kdm/Xreset'; + + return $configHash; +} + sub setupKDMScript { my $self = shift; @@ -81,7 +100,7 @@ sub setupKDMScript $script .= unshiftHereDoc(<<' End-of-Here'); rllinker kdm 1 10 - echo '/usr/bin/kdm' > /mnt/etc/X11/default-display-manager + 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 |