From 13741de77584dd38da9fd2f911c54e1bff0648ea Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Sat, 17 Mar 2007 15:12:26 +0000
Subject: * switched from using system() to slxsystem()

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@782 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/OpenSLX/OSSetup/Packager/rpm.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'installer/OpenSLX/OSSetup/Packager/rpm.pm')

diff --git a/installer/OpenSLX/OSSetup/Packager/rpm.pm b/installer/OpenSLX/OSSetup/Packager/rpm.pm
index 9956245a..06a808c8 100644
--- a/installer/OpenSLX/OSSetup/Packager/rpm.pm
+++ b/installer/OpenSLX/OSSetup/Packager/rpm.pm
@@ -35,7 +35,7 @@ sub unpackPackages
 
 	foreach my $pkg (@$pkgs) {
 		vlog 2, "unpacking package $pkg...";
-		if (system("ash", "-c", "rpm2cpio $pkg | cpio -i -d")) {
+		if (slxsystem("ash", "-c", "rpm2cpio $pkg | cpio -i -d -u")) {
 			warn _tr("unable to unpack package <%s> (%s)", $pkg, $!);
 				# TODO: change this back to die() if cpio-ing fedora6-glibc
 				#       doesn't crash anymore... (needs busybox update, I suppose)
@@ -53,7 +53,7 @@ sub importTrustedPackageKeys
 
 	foreach my $keyFile (@$keyFiles) {
 		vlog 2, "importing package key $keyFile...";
-		if (system("rpm", "--root=$finalPath", "--import", "$keyFile")) {
+		if (slxsystem("rpm", "--root=$finalPath", "--import", "$keyFile")) {
 			die _tr("unable to import package key <%s> (%s)\n", $keyFile, $!);
 		}
 	}
@@ -67,11 +67,11 @@ sub installPrerequiredPackages
 
 	return unless defined $pkgs && scalar(@$pkgs);
 
-	if (system("rpm", "--root=$finalPath", "-ivh", "--nodeps", "--noscripts",
+	if (slxsystem("rpm", "--root=$finalPath", "-ivh", "--nodeps", "--noscripts",
 			   "--force", @$pkgs)) {
 		die _tr("error during prerequired-package-installation (%s)\n", $!);
 	}
-	system("rm", "-rf", "$finalPath/var/lib/rpm");
+	slxsystem("rm", "-rf", "$finalPath/var/lib/rpm");
 }
 
 sub installPackages
@@ -82,7 +82,7 @@ sub installPackages
 
 	return unless defined $pkgs && scalar(@$pkgs);
 
-	if (system("rpm", "--root=$finalPath", "-ivh", @$pkgs)) {
+	if (slxsystem("rpm", "--root=$finalPath", "-ivh", @$pkgs)) {
 		die _tr("error during package-installation (%s)\n", $!);
 	}
 }
-- 
cgit v1.2.3-55-g7522