diff options
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index cf0939bc2..2260e894c 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -361,6 +361,21 @@ sub preConfigureTimezone { add2hash_($o->{timezone}, { UTC => $utc, ntp => $ntp }); } +sub deselectFoundMedia { + my ($o, $hdlists) = @_; + my $l = $o->ask_many_from_list('', +N("The following installation media have been found. +If you want to skip some of them, you can unselect them now."), + { + list => $hdlists, + value => sub { 1 }, + label => sub { $_[0][3] }, + }, + ); + log::l("keeping media " . map { $_->[1] } @$l); + @$l; +} + sub ask_if_suppl_media { my ($o) = @_; our $suppl_already_asked; @@ -410,7 +425,7 @@ sub selectSupplMedia { log::l($@) if $@; useMedium($medium_name); #- probe for an hdlists file and then look for all hdlists listed herein - eval { pkgs::psUsingHdlists($o->{prefix}, $suppl_method, "/mnt/cdrom/media/media_info/hdlists", $o->{packages}, '1s') }; + eval { pkgs::psUsingHdlists($o, $suppl_method, "/mnt/cdrom/media/media_info/hdlists", $o->{packages}, '1s') }; if ($@) { log::l("psUsingHdlists failed: $@"); #- no hdlists found on the suppl. CD @@ -493,7 +508,7 @@ sub setPackages { require pkgs; if (!$o->{packages} || is_empty_array_ref($o->{packages}{depslist})) { my $cdrom; - ($o->{packages}, my $suppl_method) = pkgs::psUsingHdlists($o->{prefix}, $o->{method}); + ($o->{packages}, my $suppl_method) = pkgs::psUsingHdlists($o, $o->{method}); 1 while $suppl_method = $o->selectSupplMedia($suppl_method); |