diff options
author | Oliver Tappe | 2007-12-30 18:52:18 +0100 |
---|---|---|
committer | Oliver Tappe | 2007-12-30 18:52:18 +0100 |
commit | b681bcf8ed09029520958106365fd61be8faf24f (patch) | |
tree | ee9d8e8b1cb810a2366fca180aef08dd15203a6d /installer/OpenSLX/OSSetup/Packager | |
parent | * completed test set for attribute merging, fixing several bugs along the (diff) | |
download | core-b681bcf8ed09029520958106365fd61be8faf24f.tar.gz core-b681bcf8ed09029520958106365fd61be8faf24f.tar.xz core-b681bcf8ed09029520958106365fd61be8faf24f.zip |
cleaned up installation code in several ways:
* Removed some inconsistencies with respect to the separation of prereq-
and bootstrap-packages, such that now all packages are being installed
properly into the final system (the prereq packages have to installed
twice for this).
Before, the prereq packages were being installed without their scripts
ever being run. While I haven't noticed a specific bug caused by this,
the mere possibility seemed a good enough cause to change this.
* added a default /etc/hosts file to all distros, as otherwise the lookup
of localhost is flaky (at best)
* fixed a multiple inclusion bug when expanding the packages of a selection
* improved and clarified structure of selections:
+ now there is always a 'minimal' selection, on which most others are based
+ the default selection is now merely a different name for some other
selection (currently, minimal or textmode, later this should probably be
gnome or kde).
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1438 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/OpenSLX/OSSetup/Packager')
-rw-r--r-- | installer/OpenSLX/OSSetup/Packager/Base.pm | 4 | ||||
-rw-r--r-- | installer/OpenSLX/OSSetup/Packager/rpm.pm | 20 |
2 files changed, 1 insertions, 23 deletions
diff --git a/installer/OpenSLX/OSSetup/Packager/Base.pm b/installer/OpenSLX/OSSetup/Packager/Base.pm index c33b690b..55211183 100644 --- a/installer/OpenSLX/OSSetup/Packager/Base.pm +++ b/installer/OpenSLX/OSSetup/Packager/Base.pm @@ -49,10 +49,6 @@ sub importTrustedPackageKeys { } -sub installPrerequiredPackages -{ -} - sub installPackages { } 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; |