* added suse ati file preparation

  * works only against 10.2, usual kernel problem
  * cleaned up old stuff. We shouldn't need it anymore


git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2151 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 5 insertions, 9 deletions

diff --git a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm
index 94ac131e..93314e85 100644
--- a/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/OSPlugin/xserver.pm
@@ -219,24 +219,20 @@ sub installationPhase
     my $pluginFilesPath =
         "$openslxBasePath/lib/plugins/$self->{'name'}/files";
     my $installationPath = "$pluginRepoPath/";
+    # TODO: handle it better. We know the distribution in stage1
+    if ($attrs->{'xserver::nvidia'} == 1  || $attrs->{'xserver::ati'} == 1 ) {
+        copyFile("$pluginFilesPath/ubuntu-gfx-install.sh", "$installationPath");
+        copyFile("$pluginFilesPath/suse-gfx-install.sh", "$installationPath");
+    }
     if ($attrs->{'xserver::ati'} == 1) {
         copyFile("$pluginFilesPath/ati-install.sh", "$installationPath");
         system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/ati-install.sh");
     }
     if ($attrs->{'xserver::nvidia'} == 1) {
         copyFile("$pluginFilesPath/nvidia-install.sh", "$installationPath");
-        #TODO: handle distribution. Bastian, have you testet your
-        #      script? ;-)
-        copyFile("$pluginFilesPath/suse-gfx-install.sh", "$installationPath");
         system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/nvidia-install.sh");
     }
 
-    if ($attrs->{'xserver::nvidia'} == 1 
-            || $attrs->{'xserver::ati'} == 1 ) {
-        copyFile("$pluginFilesPath/ubuntu-gfx-install.sh",
-                "$installationPath");
-    }
-
     # Some plugins have to copy files from their plugin folder into the
     # vendor-OS. Here's an example for how to do that:
     #