diff options
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 |