From 1904c006c046f380a389173fe10e2ead78705354 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Fri, 5 Jun 2009 22:32:54 +0000
Subject: use distroutils in xserver plugin remove debug code

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2941 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 lib/OpenSLX/DistroUtils.pm                        | 12 ++------
 os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm | 34 -----------------------
 os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm |  6 ++--
 3 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/lib/OpenSLX/DistroUtils.pm b/lib/OpenSLX/DistroUtils.pm
index 1bda311f..d7456d92 100644
--- a/lib/OpenSLX/DistroUtils.pm
+++ b/lib/OpenSLX/DistroUtils.pm
@@ -72,14 +72,11 @@ sub getInitFileForDistro {
 }
 
 sub getKernelVersionForDistro {
-    my $kernelPath = shift;
+	my $kernelPath = shift;
     my $distroName = shift;
-
-
-    print Dumper(@INC);    
+    my $distro;
 
     my $engine = OpenSLX::DistroUtils::Engine->new();
-    my $distro;
 
     if ($distroName) {
         $distro = $engine->loadDistro($distroName);
@@ -88,9 +85,6 @@ sub getKernelVersionForDistro {
     }
 
     return $distro->getKernelVersion($kernelPath);
-
 }
 
-
-
-1;
+1;
\ No newline at end of file
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm
index 70a08859..1cd26b56 100644
--- a/os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm
@@ -186,38 +186,4 @@ sub getdkms
 }
 
 
-sub getKernelVersion
-{
-    my $self = shift;
-    my $kernelPath = shift;
-
-    my $newestKernelFile;
-    my $newestKernelFileSortKey = '';
-    my $sortKey;
-    my $kernelPattern = '{vmlinuz,kernel-genkernel-x86}-*';
-    foreach my $kernelFile (glob("$kernelPath/$kernelPattern")) {
-        next unless $kernelFile =~ m{
-            (?:vmlinuz|x86)-(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?-(\d+(?:\.\d+)?)
-        }x;
-        $sortKey 
-            = sprintf("%02d.%02d.%02d.%02d-%2.1f", $1, $2, $3, $4||0, $5);
-        if ($newestKernelFileSortKey lt $sortKey) {
-            $newestKernelFile        = $kernelFile;
-            $newestKernelFileSortKey = $sortKey;
-        }
-    }
-
-    if (!defined $newestKernelFile) {
-        die _tr("unable to pick a kernel-file from path '%s'!", $kernelPath);
-    }
-
-    $newestKernelFile =~ /.*?-([.\-0-9]*)-([a-zA-Z]*?)$/;
-    my $kernel = {};
-    $kernel->{'version'} = $1;
-    $kernel->{'suffix'} = $2;
-    return $kernel;
-#    return $newestKernelFile;
-        
-}
-
 1;
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
index e9505b4e..e15e5355 100644
--- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
@@ -65,7 +65,7 @@ sub installNvidia
         system("rm -rf $tmpdir/*");
     }
 
-    my $mykernel = $self->SUPER::getKernelVersion("/boot");
+    my $mykernel = getKernelVersionForDistro("/boot");
     my $kver = $mykernel->{'version'};
     my $ksuffix = $mykernel->{'suffix'};
 
@@ -145,7 +145,7 @@ sub installAti
         system("rm -rf $tmpdir/*");
     }
 
-    my $mykernel = $self->SUPER::getKernelVersion("/boot");
+    my $mykernel = getKernelVersionForDistro("/boot");
     my $kver = $mykernel->{'version'};
     my $kver_ati = $kver;
     $kver_ati =~ s/-/_/;
@@ -236,7 +236,7 @@ sub installAtiOldStyle
     }
 
     $self->SUPER::getdkms();
-    my $mykernel = $self->SUPER::getKernelVersion("/boot");
+    my $mykernel = getKernelVersionForDistro("/boot");
     my $kver = $mykernel->{'version'};
     my $kver_ati = $kver;
     $kver_ati =~ s/-/_/;
-- 
cgit v1.2.3-55-g7522