* switched from perl-based distro-configuration files to "real" configuration

  files (handled by Config::General)
* removed most version specific distribution modules (only Debian-3.1 remains
  as it requires some special treatment). For all the other distributions,
  the specific info is now contained in the configuration files
* added configuration files (settings.default) for every supported 
  distribution (only Fedora is still missing some info)
* added support for inclusion of (externally generated) mirror lists and 
  automatic selection of the five best (fastest) mirrors from that list (20 
  are tried).
  For each repository, a mirror configuration file is created (in 
  /etc/opt/openslx/distro-info/<distro>/mirrors/<repo>) after that info
  has been gathered.
* added current mirror lists for each distribution repository to the
  distro-info hierarchy
* updated settings.example to reflect new configuration syntax


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

3 files changed, 4 insertions, 13 deletions

diff --git a/installer/OpenSLX/OSSetup/MetaPackager/apt.pm b/installer/OpenSLX/OSSetup/MetaPackager/apt.pm
index 1526c4ec..2fee5f7e 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/apt.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/apt.pm
@@ -78,11 +78,8 @@ sub setupPackageSource
 
 	my $sourcesList = "deb $baseURL $distribution $components\n";
 
-	my $avoidMirrors = $repoInfo->{'avoid-mirrors'} || 0;
-	if (!$avoidMirrors) {
-		foreach my $mirrorURL (@$repoURLs) {
-			$sourcesList .= "deb $mirrorURL $distribution $components\n";
-		}
+	foreach my $mirrorURL (@$repoURLs) {
+		$sourcesList .= "deb $mirrorURL $distribution $components\n";
 	}
 
 	appendFile('/etc/apt/sources.list', $sourcesList);
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/smart.pm b/installer/OpenSLX/OSSetup/MetaPackager/smart.pm
index 21fe6d92..71d9875c 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/smart.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/smart.pm
@@ -67,9 +67,6 @@ sub setupPackageSource
 		die _tr("unable to add channel '%s' (%s)\n", $repoName, $!);
 	}
 
-	my $avoidMirrors = $repoInfo->{'avoid-mirrors'} || 0;
-	return if $avoidMirrors;
-	
 	my $mirrorDescr;
 	foreach my $mirrorURL (@$repoURLs) {
 		$mirrorDescr .= " --add $baseURL$repoSubdir $mirrorURL$repoSubdir";
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
index fbb50017..337227ed 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
@@ -61,11 +61,8 @@ sub setupPackageSource
 	my $repoDescr 
 		= "[$repoName]\nname=$repoInfo->{name}\nbaseurl=$baseURL$repoSubdir\n";
 
-	my $avoidMirrors = $repoInfo->{'avoid-mirrors'} || 0;
-	if (!$avoidMirrors) {
-		foreach my $mirrorURL (@$repoURLs) {
-			$repoDescr .= "        $mirrorURL$repoSubdir\n";
-		}
+	foreach my $mirrorURL (@$repoURLs) {
+		$repoDescr .= "        $mirrorURL$repoSubdir\n";
 	}
 	my $repoFile = "/etc/yum.repos.d/$repoName.repo";
 	spitFile($repoFile, "$repoDescr\nexclude=$excludeList\n");