summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>1997-01-22 18:20:49 +0000
committerderaadt <deraadt@openbsd.org>1997-01-22 18:20:49 +0000
commitddde6cae5853c210aaf319f35cd162f045e3a11d (patch)
tree6171209b1a1b2dd6e87c4364973da28c659333bc
parentCorrect networks(5) references (diff)
downloadwireguard-openbsd-ddde6cae5853c210aaf319f35cd162f045e3a11d.tar.xz
wireguard-openbsd-ddde6cae5853c210aaf319f35cd162f045e3a11d.zip
get the ethernet/fddi issue half right. This needs to be fixed better
-rw-r--r--sys/nfs/nfs_boot.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/nfs/nfs_boot.c b/sys/nfs/nfs_boot.c
index 368dc397a6a..6e459355aea 100644
--- a/sys/nfs/nfs_boot.c
+++ b/sys/nfs/nfs_boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_boot.c,v 1.9 1997/01/20 09:42:18 graichen Exp $ */
+/* $OpenBSD: nfs_boot.c,v 1.10 1997/01/22 18:20:49 deraadt Exp $ */
/* $NetBSD: nfs_boot.c,v 1.26 1996/05/07 02:51:25 thorpej Exp $ */
/*
@@ -54,9 +54,12 @@
#include <nfs/xdr_subs.h>
#include <nfs/nfs_var.h>
-#if !defined(NFSCLIENT) || (NETHER == 0)
+#include "ether.h"
-int nfs_boot_init(nd, procp)
+#if !defined(NFSCLIENT) || (NETHER == 0 && NFDDI == 0)
+
+int
+nfs_boot_init(nd, procp)
struct nfs_diskless *nd;
struct proc *procp;
{
@@ -72,7 +75,7 @@ nfs_boot_getfh(bpsin, key, ndmntp)
/* can not get here */
}
-#else /* (if !defined(NFSCLIENT) || (NETHER == 0)) */
+#else
/*
* Support for NFS diskless booting, specifically getting information