diff options
Diffstat (limited to 'os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm')
| -rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm index a1dda709..728e6a03 100644 --- a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.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 @@ -26,6 +26,21 @@ use OpenSLX::Utils; ### interface methods ################################################################################ +# needs to be implemented ... +sub XserverPathInfo +{ + my $self = shift; + + my $pathInfo = { + config => '/etc/X11/xorg.openslx', + paths => [ + '/usr/bin', + ], + }; + + return $pathInfo; +} + sub setupXserverScript { my $self = shift; @@ -38,6 +53,11 @@ sub setupXserverScript testmkd /mnt/var/run/xauth testmkd /mnt/var/lib/xkb ln -sf /usr/bin/Xorg /mnt/etc/X11/X + # newer Xorgs do not need predefined configuration file, not needed if + # XserverPathInfo gets implemented ... + sed -e "1i# xorg.conf not needed in most cases for Xorg 1.7+" \ + /mnt/etc/X11/xorg.conf >/etc/X11/xorg.openslx 2>/dev/null + rm /mnt/etc/X11/xorg.conf 2>/dev/null End-of-Here return $script; |