diff options
author | Oliver Tappe | 2007-07-28 22:38:11 +0200 |
---|---|---|
committer | Oliver Tappe | 2007-07-28 22:38:11 +0200 |
commit | 102f63c43b0e32622bb5bf83a84cdac67174f539 (patch) | |
tree | ebd5ad2f8c50bca4e8cc38140ae55ee8071bf39c /installer/OpenSLX/OSSetup/Packager/dpkg.pm | |
parent | * changed several class interfaces as a result of trying to integrate support (diff) | |
download | core-102f63c43b0e32622bb5bf83a84cdac67174f539.tar.gz core-102f63c43b0e32622bb5bf83a84cdac67174f539.tar.xz core-102f63c43b0e32622bb5bf83a84cdac67174f539.zip |
* finished installation support for Debian-etch, Debian-sarge and Ubuntu
are nearly done (Ubuntu still missing a kernel ...)
* some more refactorings to accommodate Debian-support
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1282 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/OpenSLX/OSSetup/Packager/dpkg.pm')
-rw-r--r-- | installer/OpenSLX/OSSetup/Packager/dpkg.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/installer/OpenSLX/OSSetup/Packager/dpkg.pm b/installer/OpenSLX/OSSetup/Packager/dpkg.pm index 01867824..887a26d6 100644 --- a/installer/OpenSLX/OSSetup/Packager/dpkg.pm +++ b/installer/OpenSLX/OSSetup/Packager/dpkg.pm @@ -66,8 +66,8 @@ sub bootstrap 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 --verbose --arch $arch $releaseName \\ + my $debootstrapCmd = unshiftHereDoc(<<" END-OF-HERE"); + /usr/sbin/debootstrap --arch $arch $releaseName \\ /slxbootstrap/slxfinal $baseURL END-OF-HERE if (slxsystem("ash", "-c", "/bin/ash $debootstrapCmd")) { @@ -84,7 +84,7 @@ sub installPackages return unless defined $pkgs && @$pkgs; - if (slxsystem("rpm", "--root=$finalPath", "-ivh", @$pkgs)) { + if (slxsystem("dpkg", "--root=$finalPath", "--install", @$pkgs)) { die _tr("error during package-installation (%s)\n", $!); } return; @@ -94,8 +94,8 @@ sub getInstalledPackages { my $self = shift; - my $rpmCmd = 'rpm -qa --queryformat="%{NAME}\n"'; - my $pkgList = `$rpmCmd`; + my $rpmCmd = 'dpkg-query -f "\${package}\n" --show'; + my $pkgList = qx{$rpmCmd}; return split "\n", $pkgList; } |