Make NFS_BOOT_DHCP work as expected. trunk
authorscottr <scottr@NetBSD.org>
Sun, 11 Jan 1998 05:55:40 +0000
branchtrunk
changeset 35844 043eab412e06
parent 35843 7ac4af8c6ed6
child 35845 9fa53f66d814
Make NFS_BOOT_DHCP work as expected.
sys/nfs/nfs_boot.c
sys/nfs/nfs_bootdhcp.c
--- a/sys/nfs/nfs_boot.c	Sat Jan 10 23:08:35 1998 +0000
+++ b/sys/nfs/nfs_boot.c	Sun Jan 11 05:55:40 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_boot.c,v 1.40 1998/01/09 15:10:37 drochner Exp $	*/
+/*	$NetBSD: nfs_boot.c,v 1.41 1998/01/11 05:55:40 scottr Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -71,6 +71,7 @@
 
 #include "opt_nfs_boot_bootp.h"
 #include "opt_nfs_boot_bootparam.h"
+#include "opt_nfs_boot_dhcp.h"
 
 /*
  * There are two implementations of NFS diskless boot.
@@ -79,7 +80,7 @@
  *    nfs_bootp.c:   BOOTP (RFC951, RFC1048)
  *    nfs_bootsun.c: Sun RPC/bootparams
  */
-#ifdef NFS_BOOT_BOOTP
+#if defined(NFS_BOOT_BOOTP) || defined(NFS_BOOT_DHCP)
 int nfs_boot_rfc951 = 1; /* BOOTP enabled (default) */
 #endif
 #ifdef NFS_BOOT_BOOTPARAM
@@ -118,7 +119,7 @@
 	}
 
 	error = EADDRNOTAVAIL; /* ??? */
-#ifdef NFS_BOOT_BOOTP
+#if defined(NFS_BOOT_BOOTP) || defined(NFS_BOOT_DHCP)
 	if (nfs_boot_rfc951) {
 		printf("nfs_boot: trying BOOTP/DHCP\n");
 		error = nfs_bootdhcp(ifp, nd, procp);
--- a/sys/nfs/nfs_bootdhcp.c	Sat Jan 10 23:08:35 1998 +0000
+++ b/sys/nfs/nfs_bootdhcp.c	Sun Jan 11 05:55:40 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_bootdhcp.c,v 1.3 1998/01/09 15:13:44 drochner Exp $	*/
+/*	$NetBSD: nfs_bootdhcp.c,v 1.4 1998/01/11 05:55:41 scottr Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -77,6 +77,8 @@
 /* #include <nfs/nfs.h> */
 #include <nfs/nfsdiskless.h>
 
+#include "opt_nfs_boot_dhcp.h"
+
 /*
  * There are two implementations of NFS diskless boot.
  * This implementation uses BOOTP (RFC951, RFC1048), and