diff options
author | Michael Janczyk | 2008-10-14 22:35:53 +0200 |
---|---|---|
committer | Michael Janczyk | 2008-10-14 22:35:53 +0200 |
commit | 13aedfa8a5c657403c6ff366598ebd9434399270 (patch) | |
tree | 4b3693a97494ccc9ca14a593431ece8d82a9082c /os-plugins/plugins/desktop/OpenSLX/Distro | |
parent | version 0.0.2 - fixed bugs choosing correct image - hopefully! (diff) | |
download | core-13aedfa8a5c657403c6ff366598ebd9434399270.tar.gz core-13aedfa8a5c657403c6ff366598ebd9434399270.tar.xz core-13aedfa8a5c657403c6ff366598ebd9434399270.zip |
removed bug where kdmrc.sysconfig is not replaced
added selectprevioususe=none to kdmconf
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2299 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/desktop/OpenSLX/Distro')
-rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm | 8 | ||||
-rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm index bdbf4a2c..61e278cf 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm @@ -349,6 +349,12 @@ sub KDMConfigHashForWorkstation my $self = shift; return { +# 'General' => { +# StaticServers => ':0', +# ReserveServers => ':1,:2,:3', +# ServerVTs => '-7', +# ConsoleTTYs => 'tty1,tty2,tty3,tty4,tty5,tty6', +# }, 'X-:0-Core' => { AutoLoginEnable => 'false', AllowRootLogin => 'false', @@ -357,7 +363,6 @@ sub KDMConfigHashForWorkstation 'X-*-Greeter' => { GreetString => 'OpenSLX Workstation (%h)', SelectedUsers => '', - ShowUsers => 'Selected', UserList => 'false', }, 'X-:*-Greeter' => { @@ -367,6 +372,7 @@ sub KDMConfigHashForWorkstation 'X-:0-Greeter' => { LogSource => '/dev/xconsole', UseAdminSession => 'false', + PreselectUser => 'None', }, 'xdmcp' => { Enable => 'false', diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm index fdbb767a..dff3e65a 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm @@ -85,6 +85,8 @@ sub setupKDMScript my $configFile = $pathInfo->{config}; mkpath("/etc/opt/kdm"); mkpath("/var/adm/kdm"); + # maybe backup kdmrc.sysconfig sometimes + unlink("/var/adm/kdm/kdmrc.sysconfig"); symlink("/etc/opt/kdm/kdmrc", "/var/adm/kdm/kdmrc.sysconfig"); my $script = $self->SUPER::setupKDMScript($repoPath); @@ -104,8 +106,6 @@ sub setupKDMScript sub setupKDEHOME { - print "Info: KDEHOME isn't set for SUSE at this point.\n"; - return; } |