diff options
| author | Oliver Tappe | 2007-03-23 19:29:39 +0100 |
|---|---|---|
| committer | Oliver Tappe | 2007-03-23 19:29:39 +0100 |
| commit | 6ff9fd690f86a3d239b1e34fee1ffde89027fc40 (patch) | |
| tree | 7a4ac0cb3a9552280967618083c9e5647a637fc6 | |
| parent | * work in progress (diff) | |
| download | core-6ff9fd690f86a3d239b1e34fee1ffde89027fc40.tar.gz core-6ff9fd690f86a3d239b1e34fee1ffde89027fc40.tar.xz core-6ff9fd690f86a3d239b1e34fee1ffde89027fc40.zip | |
* fixed insane bug that resulted in deletion of every but the last yum repository
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@815 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 2 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/MetaPackager/Base.pm | 4 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/MetaPackager/yum.pm | 12 |
3 files changed, 15 insertions, 3 deletions
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index 144238e9..3df7f5c0 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -710,6 +710,7 @@ sub updateStage1D my $self = shift; vlog 1, "updating $self->{'vendor-os-name'}..."; +$self->stage1D_setupPackageSources(); $self->stage1D_updateBasicVendorOS(); } @@ -718,6 +719,7 @@ sub stage1D_setupPackageSources() my $self = shift; vlog 1, "setting up package sources for meta packager..."; + $self->{'meta-packager'}->initPackageSources(); my ($rk, $repo); while(($rk, $repo) = each %{$self->{'distro-info'}->{repository}}) { vlog 2, "setting up package source $rk..."; diff --git a/installer/OpenSLX/OSSetup/MetaPackager/Base.pm b/installer/OpenSLX/OSSetup/MetaPackager/Base.pm index 1591562c..c9e6a44e 100644 --- a/installer/OpenSLX/OSSetup/MetaPackager/Base.pm +++ b/installer/OpenSLX/OSSetup/MetaPackager/Base.pm @@ -35,6 +35,10 @@ sub initialize $self->{'engine'} = $engine; } +sub initPackageSources +{ +} + sub setupPackageSource { } diff --git a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm index 056940c3..0294fd17 100644 --- a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm +++ b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm @@ -43,6 +43,15 @@ sub initialize $ENV{LC_ALL} = 'POSIX'; } +sub initPackageSources +{ + my $self = shift; + + slxsystem("cp /proc/cpuinfo $self->{engine}->{'vendor-os-path'}/proc"); + slxsystem("rm -f $self->{engine}->{'vendor-os-path'}/etc/yum.repos.d/*"); + slxsystem("mkdir -p $self->{engine}->{'vendor-os-path'}/etc/yum.repos.d"); +} + sub setupPackageSource { my $self = shift; @@ -54,9 +63,6 @@ sub setupPackageSource $repoURL .= "/$repoInfo->{'repo-subdir'}"; } my $repoDescr = "[$repoName]\nname=$repoInfo->{name}\nbaseurl=$repoURL\n"; - slxsystem("cp /proc/cpuinfo $self->{engine}->{'vendor-os-path'}/proc"); - slxsystem("rm -f $self->{engine}->{'vendor-os-path'}/etc/yum.repos.d/*"); - slxsystem("mkdir -p $self->{engine}->{'vendor-os-path'}/etc/yum.repos.d"); my $repoFile = "$self->{engine}->{'vendor-os-path'}/etc/yum.repos.d/$repoName.repo"; open(REPO, "> $repoFile") |