[src/netbsd-1-4]: src/sys/nfs Pull up revisions 1.51-1.52 (requested by droch...

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

details:   https://anonhg.NetBSD.org/src/rev/a62ca3dfa3c9
branches:  netbsd-1-4
changeset: 469534:a62ca3dfa3c9
user:      he <he%NetBSD.org@localhost>
date:      Tue Oct 05 22:15:09 1999 +0000

description:
Pull up revisions 1.51-1.52 (requested by drochner):
  Mount diskless root with "noconn" option to allow easier use of
  multi-homed servers.
  Wait a while between bringing up interface and using it, to allow
  e.g. if_ti driver to establish the link.

diffstat:

 sys/nfs/nfs_boot.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 5291b422ad33 -r a62ca3dfa3c9 sys/nfs/nfs_boot.c
--- a/sys/nfs/nfs_boot.c        Tue Oct 05 22:11:32 1999 +0000
+++ b/sys/nfs/nfs_boot.c        Tue Oct 05 22:15:09 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_boot.c,v 1.50 1999/02/21 15:07:49 drochner Exp $   */
+/*     $NetBSD: nfs_boot.c,v 1.50.2.1 1999/10/05 22:15:09 he Exp $     */
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -211,6 +211,8 @@
                goto out;
        }
 
+       if (up)
+               delay(3000000); /* give the link some time to get up */
 out:
        soclose(so);
        return (error);
@@ -268,6 +270,7 @@
                goto out;
        }
 
+       delay(3000000); /* give the link some time to get up */
 out:
        soclose(so);
        return (error);
@@ -562,7 +565,7 @@
 #endif
        args->fh       = ndm->ndm_fh;
        args->hostname = ndm->ndm_host;
-       args->flags    = NFSMNT_RESVPORT | NFSMNT_NFSV3;
+       args->flags    = NFSMNT_NFSV3 | NFSMNT_NOCONN | NFSMNT_RESVPORT;
 
 #ifdef NFS_BOOT_OPTIONS
        args->flags    |= NFS_BOOT_OPTIONS;