[src/trunk]: src/sys/arch/i386/stand/pxeboot use our own NFS fs implementatio...

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

details:   https://anonhg.NetBSD.org/src/rev/91a5054e4619
branches:  trunk
changeset: 544100:91a5054e4619
user:      drochner <drochner%NetBSD.org@localhost>
date:      Tue Mar 11 15:01:51 2003 +0000

description:
use our own NFS fs implementation, which is smaller, does a better job
in error reporting and coexists with the TFTP fs

diffstat:

 sys/arch/i386/stand/pxeboot/Makefile  |   6 +++++-
 sys/arch/i386/stand/pxeboot/dev_net.c |  16 ++--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diffs (71 lines):

diff -r bb95b5abe05d -r 91a5054e4619 sys/arch/i386/stand/pxeboot/Makefile
--- a/sys/arch/i386/stand/pxeboot/Makefile      Tue Mar 11 14:38:45 2003 +0000
+++ b/sys/arch/i386/stand/pxeboot/Makefile      Tue Mar 11 15:01:51 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2002/11/24 23:48:48 lukem Exp $
+#      $NetBSD: Makefile,v 1.5 2003/03/11 15:01:51 drochner Exp $
 
 S=     ${.CURDIR}/../../../../
 
@@ -15,6 +15,9 @@
 .endif
 
 SRCS= main.c dev_net.c devopen.c conf.c exec.c pxe.c pxe_call.S
+# use our own nfs implementation
+.PATH: ${.CURDIR}/../libsa
+SRCS+= nfs.c
 
 .if (${BASE} == "pxeboot_ia32")
 # Various serial line configurations
@@ -34,6 +37,7 @@
 CPPFLAGS+= -DSUPPORT_BOOTP -DSUPPORT_DHCP
 CPPFLAGS+= -DSUPPORT_TFTP
 CPPFLAGS+= -DSUPPORT_NFS
+#CPPFLAGS+= -DNFS_NOSYMLINK
 
 CPPFLAGS+= -DPASS_MEMMAP
 
diff -r bb95b5abe05d -r 91a5054e4619 sys/arch/i386/stand/pxeboot/dev_net.c
--- a/sys/arch/i386/stand/pxeboot/dev_net.c     Tue Mar 11 14:38:45 2003 +0000
+++ b/sys/arch/i386/stand/pxeboot/dev_net.c     Tue Mar 11 15:01:51 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dev_net.c,v 1.1 2002/02/16 16:26:23 thorpej Exp $      */
+/*     $NetBSD: dev_net.c,v 1.2 2003/03/11 15:01:51 drochner Exp $     */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -70,8 +70,6 @@
 #include "bootparam.h"
 #include "dev_net.h"
 
-extern int nfs_root_node[];    /* XXX - get from nfs_mount() */
-
 static int netdev_sock = -1;
 static int netdev_opens;
 
@@ -115,24 +113,14 @@
                        error = net_getparams(netdev_sock);
                        if (error) {
                                /* getparams makes its own noise */
-                               goto fail;
-                       }
-                       /* Get the NFS file handle (mountd). */
-                       error = nfs_mount(netdev_sock, rootip, rootpath);
-                       if (error) {
-                               printf("net_open: NFS mount error=%d\n", error);
-                               rootip.s_addr = 0;
-                       fail:
                                netif_close(netdev_sock);
                                netdev_sock = -1;
                                return (error);
                        }
-                       if (debug)
-                               printf("net_open: NFS mount succeeded\n");
                }
        }
        netdev_opens++;
-       f->f_devdata = nfs_root_node;
+       f->f_devdata = &netdev_sock;
        return (error);
 }