* fixed some minor problems with respect to meta-packager

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

3 files changed, 27 insertions, 13 deletions

diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index b15a1e9d..f4417e84 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -172,14 +172,14 @@ sub installVendorOS
 	}
 	$self->createVendorOSPath();
 
-	$self->setupStage1A();
-	executeInSubprocess( sub {
-		# some tasks that involve a chrooted environment:
-		changePersonalityIfNeeded($self->{distro}->{'base-name'});
-		$self->setupStage1B();
-		$self->setupStage1C();
-	});
-	$self->stage1C_cleanupBasicVendorOS();
+ 	$self->setupStage1A();
+ 	executeInSubprocess( sub {
+ 		# some tasks that involve a chrooted environment:
+ 		changePersonalityIfNeeded($self->{distro}->{'base-name'});
+ 		$self->setupStage1B();
+ 		$self->setupStage1C();
+ 	});
+ 	$self->stage1C_cleanupBasicVendorOS();
 	executeInSubprocess( sub {
 		# another task that involves a chrooted environment:
 		changePersonalityIfNeeded($self->{distro}->{'base-name'});
@@ -703,6 +703,7 @@ sub setupStage1D
 	$self->stage1D_setupPackageSources();
 	$self->stage1D_updateBasicVendorOS();
 	$self->stage1D_installPackageSelection();
+	$self->{'meta-packager'}->cleanup();
 }
 
 sub updateStage1D
@@ -711,6 +712,7 @@ sub updateStage1D
 
 	vlog 1, "updating $self->{'vendor-os-name'}...";
 	$self->stage1D_updateBasicVendorOS();
+	$self->{'meta-packager'}->cleanup();
 }
 
 sub stage1D_setupPackageSources()
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/Base.pm b/installer/OpenSLX/OSSetup/MetaPackager/Base.pm
index c9e6a44e..be11ae51 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/Base.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/Base.pm
@@ -51,6 +51,10 @@ sub installSelection
 {
 }
 
+sub clean
+{
+}
+
 1;
 ################################################################################
 
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
index 0294fd17..e368b556 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
@@ -71,6 +71,17 @@ sub setupPackageSource
 	close(REPO);
 }
 
+sub installSelection
+{
+	my $self = shift;
+	my $pkgSelection = shift;
+
+	if (slxsystem("yum -y install $pkgSelection")) {
+		die _tr("unable to install selection (%s)\n", $!);
+	}
+	slxsystem('rm /proc/cpuinfo');
+}
+
 sub updateBasicVendorOS
 {
 	my $self = shift;
@@ -84,14 +95,11 @@ sub updateBasicVendorOS
 	}
 }
 
-sub installSelection
+sub cleanup
 {
 	my $self = shift;
-	my $pkgSelection = shift;
 
-	if (slxsystem("yum -y install $pkgSelection")) {
-		die _tr("unable to install selection (%s)\n", $!);
-	}
+	slxsystem('umount /proc');
 	slxsystem('rm /proc/cpuinfo');
 }