diff options
| author | Dirk von Suchodoletz | 2010-06-07 18:10:25 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2010-06-07 18:10:25 +0200 |
| commit | 2b188ee662d91eb6fb833d6278f04790f9737bdd (patch) | |
| tree | ce6cff6f4d9e17aa1f296d9732b66f0d61255e10 | |
| parent | Reflect changes for the new Workstation 7.1 and Player 3.1 and add the (diff) | |
| download | core-2b188ee662d91eb6fb833d6278f04790f9737bdd.tar.gz core-2b188ee662d91eb6fb833d6278f04790f9737bdd.tar.xz core-2b188ee662d91eb6fb833d6278f04790f9737bdd.zip | |
Reflect changes regarding the new Ubuntu 10.04 (no xserver plugin needed
in standard setups, set VT7 in kdmrc).
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm | 1 | ||||
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm index 14f56b48..d222c102 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm @@ -122,6 +122,7 @@ sub KDMConfigHashForWorkstation my $kdmVer = "4"; my $configHash = $self->SUPER::KDMConfigHashForWorkstation(); $configHash->{'General'}->{PidFile} = "/var/run/kdm.pid"; + $configHash->{'General'}->{ServerVTs} = "-7"; $configHash->{'X-:0-Core'}->{Setup} = "/etc/kde$kdmVer/kdm/Xsetup"; $configHash->{'X-:0-Core'}->{Startup} = "/etc/kde$kdmVer/kdm/Xstartup"; $configHash->{'X-:0-Core'}->{Session} = "/etc/kde$kdmVer/kdm/Xsession"; diff --git a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm index a948d222..4bd05278 100644 --- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm +++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2008 - OpenSLX GmbH +# Copyright (c) 2008..2010 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -52,7 +52,9 @@ sub getInfo Sets a desktop and creates needed configs, theme can be set as well. End-of-Here precedence => 40, - required => [ qw( xserver ) ], + # not really required e.g. for modern autoconfiguring systems like Ubuntu + # 10.04 + # required => [ qw( xserver ) ], }; } |