Ubuntu 10.04 needs changed xserver plugin behaviour - xorg.conf is not

required for Xorg 1.7+ servers ...

2 files changed, 92 insertions, 0 deletions

diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm
index 537ef54c..a1dda709 100644
--- a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm
@@ -37,6 +37,7 @@ sub setupXserverScript
         # Ubuntu specific extension to stage3 xserver.sh
         testmkd /mnt/var/run/xauth
         testmkd /mnt/var/lib/xkb
+        ln -sf /usr/bin/Xorg /mnt/etc/X11/X
     End-of-Here
 
     return $script;
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu_10.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu_10.pm
new file mode 100644
index 00000000..9145c5ba
--- /dev/null
+++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu_10.pm
@@ -0,0 +1,91 @@
+# Copyright (c) 2008 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# xserver/OpenSLX/Distro/Ubuntu.pm
+#    - provides Ubuntu-specific overrides of the distro API for the xserver
+#      plugin.
+# -----------------------------------------------------------------------------
+package xserver::OpenSLX::Distro::Ubuntu;
+
+use strict;
+use warnings;
+
+use base qw(xserver::OpenSLX::Distro::Base);
+
+use OpenSLX::Basics;
+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;
+    my $repoPath = shift;
+
+    my $script = $self->SUPER::setupXserverScript($repoPath);
+
+    $script .= unshiftHereDoc(<<'    End-of-Here');
+        # Ubuntu specific extension to stage3 xserver.sh
+        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;
+}
+
+
+sub installNvidia
+{
+    my $self = shift;
+    my $repopath = shift || "/opt/openslx/plugin-repo/xserver/";
+    my $pkgpath = shift || "packages";
+
+    my $distroName = $self->{engine}->distroName();
+
+    system($repopath."/ubuntu-gfx-install.sh nvidia $distroName");
+   
+}
+
+sub installAti
+{
+    my $self = shift;
+    my $repopath = shift || "/opt/openslx/plugin-repo/xserver/";
+    my $pkgpath = shift || "packages";
+
+    my $distroName = $self->{engine}->distroName();
+
+    system($repopath."/ubuntu-gfx-install.sh ati $distroName");
+ 
+}
+
+1;