diff options
Diffstat (limited to 'installer/OpenSLX/OSSetup/Packager/rpm.pm')
| -rw-r--r-- | installer/OpenSLX/OSSetup/Packager/rpm.pm | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/installer/OpenSLX/OSSetup/Packager/rpm.pm b/installer/OpenSLX/OSSetup/Packager/rpm.pm index 0fd502a0..db1e7e1f 100644 --- a/installer/OpenSLX/OSSetup/Packager/rpm.pm +++ b/installer/OpenSLX/OSSetup/Packager/rpm.pm @@ -40,9 +40,7 @@ sub bootstrap foreach my $pkg (@$pkgs) { vlog(2, "unpacking package $pkg..."); 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) + die _tr("unable to unpack package <%s> (%s)", $pkg, $!); } } return; @@ -65,22 +63,6 @@ sub importTrustedPackageKeys return; } -sub installPrerequiredPackages -{ - my $self = shift; - my $pkgs = shift; - my $finalPath = shift; - - return unless defined $pkgs && scalar(@$pkgs); - - if (slxsystem("rpm", "--root=$finalPath", "-ivh", "--nodeps", "--noscripts", - "--force", @$pkgs)) { - die _tr("error during prerequired-package-installation (%s)\n", $!); - } - slxsystem("rm", "-rf", "$finalPath/var/lib/rpm"); - return; -} - sub installPackages { my $self = shift; |