summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-09-25 08:26:50 +0000
committerFrancois Pons <fpons@mandriva.com>2001-09-25 08:26:50 +0000
commitd4b2b94326f76aa9ba9540a7e9bc3519f865035b (patch)
tree431310261e29185b05e72bb624f368316daf1855
parent4b8c59a17adef232c3e1997b47876e7df72bbce3 (diff)
downloaddrakx-d4b2b94326f76aa9ba9540a7e9bc3519f865035b.tar
drakx-d4b2b94326f76aa9ba9540a7e9bc3519f865035b.tar.gz
drakx-d4b2b94326f76aa9ba9540a7e9bc3519f865035b.tar.bz2
drakx-d4b2b94326f76aa9ba9540a7e9bc3519f865035b.tar.xz
drakx-d4b2b94326f76aa9ba9540a7e9bc3519f865035b.zip
make current boot medium already selected if multiple hdlist are on this boot medium.
-rw-r--r--perl-install/install_steps_interactive.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 04dbf0fbb..cf0fafde4 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -683,9 +683,8 @@ sub chooseCD {
return;
}
- #- 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 @mediums == () || !$::expert;
+ #- the boot medium is already selected.
+ $mediumsDescr{pkgs::mediumDescr($packages, $install_any::boot_medium)} = 1;
#- build mediumDescr according to mediums, this avoid asking multiple times
#- all the medium grouped together on only one CD.
@@ -695,6 +694,10 @@ 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 you have all the CDs in the list below, click Ok.