diff options
Diffstat (limited to 'installer/OpenSLX/OSSetup/Packager/dpkg.pm')
| -rw-r--r-- | installer/OpenSLX/OSSetup/Packager/dpkg.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/installer/OpenSLX/OSSetup/Packager/dpkg.pm b/installer/OpenSLX/OSSetup/Packager/dpkg.pm index cdd55e56..01867824 100644 --- a/installer/OpenSLX/OSSetup/Packager/dpkg.pm +++ b/installer/OpenSLX/OSSetup/Packager/dpkg.pm @@ -63,8 +63,12 @@ sub bootstrap if (slxsystem("ash", "-c", "rm -f debian-binary *.tar.gz")) { die _tr("unable to cleanup package '%s' (%s)", $debootstrapPkg, $!); } + my $arch = $self->{engine}->{distro}->{arch}; + my $releaseName = $self->{engine}->{distro}->{'release-name'}; + my $baseURL = $self->{engine}->{baseURLs}->[0]; my $debootstrapCmd = <<" END-OF-HERE"; - /usr/sbin/debootstrap --arch i386 edgy /slxbootstrap/slxfinal http://localhost:5080/srv/ftp/pub/ubuntu + /usr/sbin/debootstrap --verbose --arch $arch $releaseName \\ + /slxbootstrap/slxfinal $baseURL END-OF-HERE if (slxsystem("ash", "-c", "/bin/ash $debootstrapCmd")) { die _tr("unable to run debootstrap (%s)", $!); @@ -78,7 +82,7 @@ sub installPackages my $pkgs = shift; my $finalPath = shift; - return unless defined $pkgs && scalar(@$pkgs); + return unless defined $pkgs && @$pkgs; if (slxsystem("rpm", "--root=$finalPath", "-ivh", @$pkgs)) { die _tr("error during package-installation (%s)\n", $!); |