diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install_any.pm | 12 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index b251cd8b9..857fd136e 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -328,7 +328,6 @@ sub setPackages { "Supplementary CD $medium", 1, # selected "/mnt/cdrom/Mandrake/base/hdlist$medium.cz", - #'/mnt/cdrom/Mandrake/base/pubkey', ); if ($supplmedium) { log::l("read suppl hdlist"); @@ -358,8 +357,15 @@ sub setPackages { pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1); #- must be done after getProvides - pkgs::read_rpmsrate($o->{packages}, getFile("Mandrake/base/rpmsrate")); - ($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers($o->{meta_class}); + #- if there is a supplementary CD, override the rpmsrate/compssUsers + pkgs::read_rpmsrate( + $o->{packages}, + getFile($suppl_CDs ? "/mnt/cdrom/Mandrake/base/rpmsrate" : "Mandrake/base/rpmsrate") + ); + ($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers( + $o->{meta_class}, + $suppl_CDs ? "/mnt/cdrom/Mandrake/base/compssUsers" : "", + ); #- preselect default_packages and compssUsersChoices. setDefaultPackages($o); diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index a6e1ead7e..1842f68db 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -571,9 +571,9 @@ sub read_rpmsrate { } sub readCompssUsers { - my ($meta_class) = @_; + my ($meta_class, $file) = @_; - my $file = 'Mandrake/base/compssUsers'; + $file = 'Mandrake/base/compssUsers' if !$file; my $f = $meta_class && install_any::getFile("$file.$meta_class") || install_any::getFile($file) or die "can't find $file"; readCompssUsers_raw($f); } |