* merged pickKernelFile() from Gentoo.pm into the implementation in Base.pm

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

2 files changed, 3 insertions, 27 deletions

diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index c2db8764..809a625d 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -215,9 +215,10 @@ sub pickKernelFile
 
     my $newestKernelFile;
     my $newestKernelFileSortKey = '';
-    foreach my $kernelFile (glob("$kernelPath/vmlinuz-*")) {
+    my $kernelPattern = '{vmlinuz,kernel-genkernel-x86}-*';
+    foreach my $kernelFile (glob("$kernelPath/$kernelPattern")) {
         next unless $kernelFile =~ m{
-            vmlinuz-(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?-(\d+(?:\.\d+)?)
+            (?:vmlinuz|x86)-(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?-(\d+(?:\.\d+)?)
         }x;
         my $sortKey 
             = sprintf("%02d.%02d.%02d.%02d-%2.1f", $1, $2, $3, $4||0, $5);
diff --git a/installer/OpenSLX/OSSetup/Distro/Gentoo.pm b/installer/OpenSLX/OSSetup/Distro/Gentoo.pm
index 1f1e0577..79fd0e29 100644
--- a/installer/OpenSLX/OSSetup/Distro/Gentoo.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Gentoo.pm
@@ -30,29 +30,4 @@ sub new
     return bless $self, $class;
 }
 
-sub pickKernelFile
-{
-    my $self       = shift;
-    my $kernelPath = shift;
-
-    my $newestKernelFile;
-    my $newestKernelFileSortKey = '';
-    foreach my $kernelFile (glob("$kernelPath/kernel-genkernel-x86-*")) {
-        next unless $kernelFile =~ m{
-            x86-(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?-(\d+(?:\.\d+)?)
-        }x;
-        my $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);
-    }
-    return $newestKernelFile;
-}
-
 1;