summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-07-14 08:27:33 +0000
committerOlivier Blin <oblin@mandriva.org>2004-07-14 08:27:33 +0000
commit4e31976d5b266415fe7d8458aeafa65994254254 (patch)
tree31e4984a029d61429e6225ed57409403ded77a6a /perl-install/install_steps_interactive.pm
parentc8f524a84ea36554d8aa84b24b44511a0e4c94a6 (diff)
downloaddrakx-4e31976d5b266415fe7d8458aeafa65994254254.tar
drakx-4e31976d5b266415fe7d8458aeafa65994254254.tar.gz
drakx-4e31976d5b266415fe7d8458aeafa65994254254.tar.bz2
drakx-4e31976d5b266415fe7d8458aeafa65994254254.tar.xz
drakx-4e31976d5b266415fe7d8458aeafa65994254254.zip
automatically detect which media are available in install from ISO images
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm16
1 files changed, 10 insertions, 6 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index c3894f22f..cbc5cf915 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -636,12 +636,15 @@ sub chooseCD {
$mediumsDescr{$descr} ||= $packages->{mediums}{$_}{selected};
}
- #- if no other medium available or a poor beginner, we are choosing for him!
- #- note first CD is always selected and should not be unselected!
- return if @mediumsDescr == () || !$::expert;
-
-# $o->set_help('chooseCD');
- $o->ask_many_from_list('',
+ if (install_any::method_is_from_ISO_images($o->{method})) {
+ $mediumsDescr{$_} = defined(install_any::find_ISO_image_labelled($_)) || 0 foreach (@mediumsDescr);
+ } elsif ($method eq "cdrom") {
+ #- if no other medium available or a poor beginner, we are choosing for him!
+ #- note first CD is always selected and should not be unselected!
+ return if @mediumsDescr == () || !$::expert;
+
+ # $o->set_help('chooseCD');
+ $o->ask_many_from_list('',
N("If you have all the CDs in the list below, click Ok.
If you have none of those CDs, click Cancel.
If only some CDs are missing, unselect them, then click Ok."),
@@ -652,6 +655,7 @@ If only some CDs are missing, unselect them, then click Ok."),
}) or do {
$mediumsDescr{$_} = 0 foreach @mediumsDescr; #- force unselection of other CDs.
};
+ }
#- restore true selection of medium (which may have been grouped together)
foreach (@mediums) {