NFS Diskless booting support added.

diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 917137c..c9407c1 100644 (file)
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)autoconf.c    7.1 (Berkeley) 5/9/91
  * SUCH DAMAGE.
  *
  *     from: @(#)autoconf.c    7.1 (Berkeley) 5/9/91

- *     $Id: autoconf.c,v 1.5 1993/11/25 01:30:46 wollman Exp $
+ *     $Id: autoconf.c,v 1.6 1993/12/19 00:49:57 wollman Exp $

  */
 
 /*
  */
 
 /*


@@ -79,12 +79,14 @@ configure()
        isa_configure();
 #endif
 
        isa_configure();
 #endif
 

-#if GENERICxxx
+#if GENERICxxx && !defined(DISKLESS)

        if ((boothowto & RB_ASKNAME) == 0)
                setroot();
        setconf();
 #else
        if ((boothowto & RB_ASKNAME) == 0)
                setroot();
        setconf();
 #else

+#ifndef DISKLESS

        setroot();
        setroot();

+#endif

 #endif
        /*
         * Configure swap area and related system
 #endif
        /*
         * Configure swap area and related system

diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 8ebcd9f..3c17e7e 100644 (file)
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)locore.s      7.3 (Berkeley) 5/13/91
  * SUCH DAMAGE.
  *
  *     from: @(#)locore.s      7.3 (Berkeley) 5/13/91

- *     $Id: locore.s,v 1.11 1993/11/14 02:27:22 rgrimes Exp $
+ *     $Id: locore.s,v 1.12 1994/01/14 16:23:33 davidg Exp $

  */
 
 /*
  */
 
 /*


@@ -165,6 +165,13 @@ ENTRY(btext)
        movl    16(%esp),%eax
        addl    $KERNBASE,%eax
        movl    %eax,_esym-KERNBASE
        movl    16(%esp),%eax
        addl    $KERNBASE,%eax
        movl    %eax,_esym-KERNBASE

+#ifdef DISKLESS                                        /* Copy diskless structure */
+       movl    _nfs_diskless_size-KERNBASE,%ecx
+       movl    20(%esp),%esi
+       movl    $(_nfs_diskless-KERNBASE),%edi
+       rep
+       movsb
+#endif

 
        /* find out our CPU type. */
         pushfl
 
        /* find out our CPU type. */
         pushfl