diff options
| author | tegge <tegge@FreeBSD.org> | 1997-05-15 19:12:56 +0000 |
|---|---|---|
| committer | tegge <tegge@FreeBSD.org> | 1997-05-15 19:12:56 +0000 |
| commit | 6d6d2c4e4ee05a2cbee73a45761bd378d8afea09 (patch) | |
| tree | 2da459a772793e91290099feb9f8acfc8ac22319 /sys/i386 | |
| parent | 3bad2177621317b87ec87855f2bddcd8f73b46d2 (diff) | |
| download | FreeBSD-src-6d6d2c4e4ee05a2cbee73a45761bd378d8afea09.zip FreeBSD-src-6d6d2c4e4ee05a2cbee73a45761bd378d8afea09.tar.gz | |
Ignore the supplied nfs_diskless structure from the bootstrap loader
if we want to use NFS v3 to mount root and swap.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/locore.s | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index 05ce518..86b4b5f 100644 --- 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 - * $Id: locore.s,v 1.85 1997/04/22 06:55:24 jdp Exp $ + * $Id: locore.s,v 1.86 1997/04/26 11:45:08 peter Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -550,6 +550,7 @@ got_common_bi_size: movsb #ifdef NFS +#ifndef BOOTP_NFSV3 /* * If we have a nfs_diskless structure copy it in */ @@ -564,6 +565,7 @@ got_common_bi_size: movl $R(_nfs_diskless_valid),%edi movl $1,(%edi) #endif +#endif /* * The old style disk boot. |
