* fixed problem reported by Bastian about pickKernelFile not correctly being

  used (turned out to be a problem when loading the distro-module for
  clone-only distributions)
* cleaned up the distro module structure while looking at it

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

7 files changed, 93 insertions, 16 deletions

diff --git a/installer/OpenSLX/OSSetup/Distro/Any_Clone.pm b/installer/OpenSLX/OSSetup/Distro/Any_Clone.pm
index 0433b9a4..9f3f54cc 100644
--- a/installer/OpenSLX/OSSetup/Distro/Any_Clone.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Any_Clone.pm
@@ -19,14 +19,12 @@ use warnings;
 use base qw(OpenSLX::OSSetup::Distro::Base);
 
 ################################################################################
-### implementation
+### interface methods
 ################################################################################
 sub new
 {
 	my $class = shift;
-	my $self = {
-		'base-name' => 'any-clone',
-	};
+	my $self = {};
 	return bless $self, $class;
 }
 
diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index 020215ea..f29c7e46 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -37,7 +37,7 @@ sub initialize
 
 	$self->{'engine'} = $engine;
 
-	if ($self->{'base-name'} =~ m[x86_64]) {
+	if ($engine->{'distro-name'} =~ m[x86_64]) {
 		# be careful to only try installing 64-bit systems if actually
 		# running on a 64-bit host, as otherwise we are going to fail later,
 		# anyway:
diff --git a/installer/OpenSLX/OSSetup/Distro/Debian.pm b/installer/OpenSLX/OSSetup/Distro/Debian.pm
index 48391f55..69f08256 100644
--- a/installer/OpenSLX/OSSetup/Distro/Debian.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Debian.pm
@@ -21,8 +21,15 @@ use base qw(OpenSLX::OSSetup::Distro::Base);
 use OpenSLX::Basics;
 
 ################################################################################
-### implementation
+### interface methods
 ################################################################################
+sub new
+{
+	my $class = shift;
+	my $self = {};
+	return bless $self, $class;
+}
+
 sub initialize
 {
 	my $self = shift;
diff --git a/installer/OpenSLX/OSSetup/Distro/Fedora.pm b/installer/OpenSLX/OSSetup/Distro/Fedora.pm
index 5206a07e..7fe4973c 100644
--- a/installer/OpenSLX/OSSetup/Distro/Fedora.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Fedora.pm
@@ -21,8 +21,15 @@ use base qw(OpenSLX::OSSetup::Distro::Base);
 use OpenSLX::Basics;
 
 ################################################################################
-### implementation
+### interface methods
 ################################################################################
+sub new
+{
+	my $class = shift;
+	my $self = {};
+	return bless $self, $class;
+}
+
 sub initialize
 {
 	my $self = shift;
diff --git a/installer/OpenSLX/OSSetup/Distro/Gentoo.pm b/installer/OpenSLX/OSSetup/Distro/Gentoo.pm
new file mode 100644
index 00000000..4d1032f7
--- /dev/null
+++ b/installer/OpenSLX/OSSetup/Distro/Gentoo.pm
@@ -0,0 +1,58 @@
+# Copyright (c) 2006, 2007 - 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/
+# -----------------------------------------------------------------------------
+# SUSE.pm
+#	- provides SUSE-specific overrides of the OpenSLX OSSetup API.
+# -----------------------------------------------------------------------------
+package OpenSLX::OSSetup::Distro::Gentoo;
+
+use strict;
+use warnings;
+
+use base qw(OpenSLX::OSSetup::Distro::Base);
+
+use OpenSLX::Basics;
+
+################################################################################
+### interface methods
+################################################################################
+sub new
+{
+	my $class = shift;
+	my $self = {};
+	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;
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE.pm b/installer/OpenSLX/OSSetup/Distro/SUSE.pm
index 0662cd64..00cd4bc4 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE.pm
@@ -21,8 +21,15 @@ use base qw(OpenSLX::OSSetup::Distro::Base);
 use OpenSLX::Basics;
 
 ################################################################################
-### implementation
+### interface methods
 ################################################################################
+sub new
+{
+	my $class = shift;
+	my $self = {};
+	return bless $self, $class;
+}
+
 sub initialize
 {
 	my $self   = shift;
diff --git a/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm b/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm
index 17c30662..32e9e91c 100644
--- a/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm
@@ -21,8 +21,15 @@ use base qw(OpenSLX::OSSetup::Distro::Base);
 use OpenSLX::Basics;
 
 ################################################################################
-### implementation
+### interface methods
 ################################################################################
+sub new
+{
+	my $class = shift;
+	my $self = {};
+	return bless $self, $class;
+}
+
 sub initialize
 {
 	my $self = shift;
@@ -35,11 +42,4 @@ sub initialize
 	return;
 }
 
-sub fixPrerequiredFiles
-{
-	my $self = shift;
-	my $stage1cDir = shift;
-	return;
-}
-
 1;
\ No newline at end of file