avoid generating headers for copying file in postinstall-rpm directory.

make sure not to crash if a package that should have been in CD1 is somewhere
else.

1 files changed, 2 insertions, 4 deletions

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 7fafa1819..9c81bb796 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -41,8 +41,7 @@ my $cdrom = undef;
 sub useMedium($) {
     #- before ejecting the first CD, there are some files to copy!
     #- does nothing if the function has already been called.
-    #$_[0] > 1 and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
-    $_[0] > 1 and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
+    $_[0] > 1 and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
 
     $asked_medium eq $_[0] or log::l("selecting new medium '$_[0]'");
     $asked_medium = $_[0];
@@ -169,8 +168,7 @@ sub setup_postinstall_rpms($$) {
     #- the complete filename of each package.
     #- copy the package files in the postinstall RPMS directory.
     #- last arg is default medium '' known as the CD#1.
-    pkgs::extractHeaders($prefix, \@toCopy, $packages->{mediums});
-    cp_af((map { "/tmp/image/" . relGetFile(pkgs::packageFile($_)) } @toCopy), $postinstall_rpms);
+    eval { cp_af((map { "/tmp/image/" . relGetFile(pkgs::packageFile($_)) } @toCopy), $postinstall_rpms) };
 
     log::l("copying Auto Install Floppy");
     getAndSaveInstallFloppy($::o, "$postinstall_rpms/auto_install.img");