summaryrefslogtreecommitdiffstats
path: root/installer/OpenSLX/OSSetup/MetaPackager
diff options
context:
space:
mode:
Diffstat (limited to 'installer/OpenSLX/OSSetup/MetaPackager')
-rw-r--r--installer/OpenSLX/OSSetup/MetaPackager/apt.pm7
-rw-r--r--installer/OpenSLX/OSSetup/MetaPackager/smart.pm3
-rw-r--r--installer/OpenSLX/OSSetup/MetaPackager/yum.pm7
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");