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/Base.pm27
-rw-r--r--installer/OpenSLX/OSSetup/MetaPackager/smart.pm8
-rw-r--r--installer/OpenSLX/OSSetup/MetaPackager/yum.pm8
3 files changed, 8 insertions, 35 deletions
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/Base.pm b/installer/OpenSLX/OSSetup/MetaPackager/Base.pm
index d5b42f20..dd552071 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/Base.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/Base.pm
@@ -53,33 +53,6 @@ sub installSelection
{
}
-sub startSession
-{
- my $self = shift;
-
- addCleanupFunction('slxos-setup::meta-packager',
- sub { $self->finishSession(); } );
-
- system('mount -t proc proc /proc 2>/dev/null');
-
- $self->{engine}->{distro}->startSession();
- # allow vendor specific extensions
- return;
-}
-
-sub finishSession
-{
- my $self = shift;
-
- $self->{engine}->{distro}->finishSession();
- # allow vendor specific extensions
-
- system('umount /proc 2>/dev/null');
-
- removeCleanupFunction('slxos-setup::meta-packager');
- return;
-}
-
1;
################################################################################
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/smart.pm b/installer/OpenSLX/OSSetup/MetaPackager/smart.pm
index 3b266ee7..5303a50a 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/smart.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/smart.pm
@@ -57,16 +57,16 @@ sub initPackageSources
sub setupPackageSource
{
- my $self = shift;
- my $repoName = shift;
- my $repoInfo = shift;
+ my $self = shift;
+ my $repoName = shift;
+ my $repoInfo = shift;
my $excludeList = shift;
+ my $repoURLs = shift;
my $repoSubdir = '';
if (length($repoInfo->{'repo-subdir'})) {
$repoSubdir = "/$repoInfo->{'repo-subdir'}";
}
- my $repoURLs = $self->{engine}->sortRepositoryURLs($repoInfo);
my $baseURL = shift @$repoURLs;
my $repoDescr
= qq[$repoName name="$repoInfo->{name}" baseurl=$baseURL$repoSubdir];
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
index 77ac11d1..684d125b 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
@@ -54,16 +54,16 @@ sub initPackageSources
sub setupPackageSource
{
- my $self = shift;
- my $repoName = shift;
- my $repoInfo = shift;
+ my $self = shift;
+ my $repoName = shift;
+ my $repoInfo = shift;
my $excludeList = shift;
+ my $repoURLs = shift;
my $repoSubdir;
if (length($repoInfo->{'repo-subdir'})) {
$repoSubdir = "/$repoInfo->{'repo-subdir'}";
}
- my $repoURLs = $self->{engine}->sortRepositoryURLs($repoInfo);
my $baseURL = shift @$repoURLs;
my $repoDescr