diff options
author | Sebastian Schmelzer | 2009-06-06 00:32:54 +0200 |
---|---|---|
committer | Sebastian Schmelzer | 2009-06-06 00:32:54 +0200 |
commit | 1904c006c046f380a389173fe10e2ead78705354 (patch) | |
tree | ef338c73fc5fd6432af14c4bcbbc2f0aea1b0d28 /os-plugins | |
parent | remove debug code (diff) | |
download | core-1904c006c046f380a389173fe10e2ead78705354.tar.gz core-1904c006c046f380a389173fe10e2ead78705354.tar.xz core-1904c006c046f380a389173fe10e2ead78705354.zip |
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
Diffstat (limited to 'os-plugins')
-rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/Distro/Base.pm | 34 | ||||
-rw-r--r-- | os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm | 6 |
2 files changed, 3 insertions, 37 deletions
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/-/_/; |