summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-01 14:52:05 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-01 14:52:05 +0000
commit49eafa92c1ab3ca9eb7186db6f1740e61d3298d5 (patch)
tree003313793d0cb3ef617616dd629a72519e34d25d /perl-install
parent7500141d25b684ab1605d365c75b9bdfd1f695f4 (diff)
downloaddrakx-49eafa92c1ab3ca9eb7186db6f1740e61d3298d5.tar
drakx-49eafa92c1ab3ca9eb7186db6f1740e61d3298d5.tar.gz
drakx-49eafa92c1ab3ca9eb7186db6f1740e61d3298d5.tar.bz2
drakx-49eafa92c1ab3ca9eb7186db6f1740e61d3298d5.tar.xz
drakx-49eafa92c1ab3ca9eb7186db6f1740e61d3298d5.zip
- when mounting cdrom fails, retry a few times since mount will now fail
instead of waiting for the drive to recognise the CD (cf #43230)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm7
2 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index cf7d36626..2bb15ee89 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- when mounting cdrom fails, retry a few times since mount will now fail
+ instead of waiting for the drive to recognise the CD (cf #43230)
- add help button for media selection step
- fix/adjust some help pages (#42986)
- fix dithering regression (introduced on 2008-09-29)
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index d8812c02b..3232fd92f 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -385,7 +385,12 @@ sub ask_change_cd_ {
Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.
If you do not have it, press Cancel to avoid installation from this Cd-Rom.", $phys_m->{name}), 1) or return;
- eval { fs::mount::part($phys_m) };
+ foreach (1 .. 7) {
+ eval { fs::mount::part($phys_m) };
+ last if $phys_m->{isMounted};
+ # we must retry since mount will now fail until the drive recognises the CD (cf #43230)
+ sleep 2;
+ }
#- it can be a directory, so don't use -f
!$o_rel_file || -e install::media::path($phys_m, $o_rel_file) and return 1;