diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-09-22 11:26:53 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-09-22 11:26:53 +0000 |
| commit | 5ccb00978c203295c4bf726a9530c8d696a9f286 (patch) | |
| tree | 91ffea3e43557824bdc775e8b122af2320004961 /perl-install/install_steps.pm | |
| parent | 8507f5529c1fa95cf068076001adc1dbdc91e4fc (diff) | |
| download | drakx-5ccb00978c203295c4bf726a9530c8d696a9f286.tar drakx-5ccb00978c203295c4bf726a9530c8d696a9f286.tar.gz drakx-5ccb00978c203295c4bf726a9530c8d696a9f286.tar.bz2 drakx-5ccb00978c203295c4bf726a9530c8d696a9f286.tar.xz drakx-5ccb00978c203295c4bf726a9530c8d696a9f286.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index eca7b612d..bde4d8d18 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -361,6 +361,7 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK! delete $ENV{DURING_INSTALL}; run_program::rooted($o->{prefix}, 'ldconfig') or die "ldconfig failed!"; log::l("Install took: ", formatTimeRaw(time - $time)); + log_sizes($o); } sub afterInstallPackages($) { @@ -431,9 +432,12 @@ Consoles 1,3,4,7 may also contain interesting information"; install_any::install_urpmi($o->{prefix}, $o->{method}, $o->{packages}[2]); substInFile { s/^urpmi\n//; $_ .= "urpmi\n" if eof } "$msec/group.conf" if -d $msec; } - - install_any::getAndSaveFile('RPM-GPG-KEYS', '/root/tmp/RPM-GPG-KEYS'); - run_program::rooted($o->{prefix}, qw(gpg --fast-import --keyring /etc/rpm/pubring.gpg /root/tmp/RPM-GPG-KEYS)); + { + my $f = "$o->{prefix}/root/tmp/RPM-GPG-KEYS"; + install_any::getAndSaveFile('RPM-GPG-KEYS', $f); + run_program::rooted($o->{prefix}, qw(gpg --import --homedir /etc/rpm /root/tmp/RPM-GPG-KEYS)); + unlink $f; + } # #- update language and icons for KDE. # update_userkderc($o->{prefix}, 'Locale', Language => ""); @@ -837,7 +841,11 @@ sub generateAutoInstFloppy($) { } #------------------------------------------------------------------------------ -sub exitInstall { install_any::unlockCdrom } +sub exitInstall { + my ($o) = @_; + install_any::unlockCdrom; + install_any::log_sizes($o); +} #------------------------------------------------------------------------------ sub hasNetwork { |