[src/netbsd-1-6]: src/distrib/utils/sysinst Pullup rev 1.82 (requested by gra...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/14317f023cb2
branches:  netbsd-1-6
changeset: 530130:14317f023cb2
user:      jmc <jmc%NetBSD.org@localhost>
date:      Fri Feb 14 02:52:21 2003 +0000

description:
Pullup rev 1.82 (requested by grant in ticket #1166)
 Put a retry loop around the cd mount to try and handle slow cd
 spinup's that might return EIO on some systems. Fixes PR#20165

diffstat:

 distrib/utils/sysinst/util.c |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (28 lines):

diff -r 3d89789fe311 -r 14317f023cb2 distrib/utils/sysinst/util.c
--- a/distrib/utils/sysinst/util.c      Fri Feb 14 02:51:41 2003 +0000
+++ b/distrib/utils/sysinst/util.c      Fri Feb 14 02:52:21 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.67.2.10 2003/02/11 08:24:31 jmc Exp $       */
+/*     $NetBSD: util.c,v 1.67.2.11 2003/02/14 02:52:21 jmc Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -251,6 +251,7 @@
 get_via_cdrom()
 {
        char tmpdir[STRSIZE];
+       int retries = 0;
 
        /* Get CD-rom device name and path within CD-rom */
        process_menu(MENU_cdromsource);
@@ -261,6 +262,10 @@
        /* Mount it */
        if (run_prog(0, NULL,
            "/sbin/mount -rt cd9660 /dev/%sa /mnt2", cdrom_dev)) {
+               if (retries++ < 5) {
+                       sleep(1);
+                       goto again;
+               }
                msg_display(MSG_badsetdir, cdrom_dev);
                process_menu(MENU_cdrombadmount);
                if (!yesno)