Make the BOOTP family new-style options (in opt_bootp.h)

11 files changed, 29 insertions, 11 deletions

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 5e71aeb..59919da 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.81 1997/11/21 18:14:02 bde Exp $
+ *	$Id: autoconf.c,v 1.82 1997/11/21 18:27:08 bde Exp $
  */
 
 /*
@@ -45,6 +45,7 @@
  * devices are determined (from possibilities mentioned in ioconf.c),
  * and the drivers are initialized.
  */
+#include "opt_bootp.h"
 #include "opt_cd9660.h"
 
 #include <sys/param.h>
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 81b373a..6637226 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.101 1997/11/04 03:19:25 kato Exp $
+ *	$Id: locore.s,v 1.102 1997/11/07 19:58:32 tegge Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -44,6 +44,7 @@
  */
 
 #include "apm.h"
+#include "opt_bootp.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_userconfig.h"
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index 81b373a..6637226 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.101 1997/11/04 03:19:25 kato Exp $
+ *	$Id: locore.s,v 1.102 1997/11/07 19:58:32 tegge Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -44,6 +44,7 @@
  */
 
 #include "apm.h"
+#include "opt_bootp.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_userconfig.h"
diff --git a/sys/conf/options b/sys/conf/options
index 585a1e8..438c92a 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.43 1998/01/08 23:40:23 eivind Exp $
+#	$Id: options,v 1.44 1998/01/09 00:51:51 eivind Exp $
 
 # Format:
 # Option name	filename
@@ -99,6 +99,10 @@ OPEN_MAX		opt_defunct.h
 
 # Net stuff.
 ARP_PROXYALL		opt_defunct.h
+BOOTP			opt_bootp.h
+BOOTP_COMPAT		opt_bootp.h
+BOOTP_NFSROOT		opt_bootp.h
+BOOTP_NFSV3		opt_bootp.h
 GATEWAY			opt_defunct.h
 MROUTING		opt_mrouting.h
 INET			opt_inet.h
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 5e71aeb..59919da 100644
--- 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
- *	$Id: autoconf.c,v 1.81 1997/11/21 18:14:02 bde Exp $
+ *	$Id: autoconf.c,v 1.82 1997/11/21 18:27:08 bde Exp $
  */
 
 /*
@@ -45,6 +45,7 @@
  * devices are determined (from possibilities mentioned in ioconf.c),
  * and the drivers are initialized.
  */
+#include "opt_bootp.h"
 #include "opt_cd9660.h"
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 81b373a..6637226 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.101 1997/11/04 03:19:25 kato Exp $
+ *	$Id: locore.s,v 1.102 1997/11/07 19:58:32 tegge Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -44,6 +44,7 @@
  */
 
 #include "apm.h"
+#include "opt_bootp.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_userconfig.h"
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index b5f9b259..4a103be 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.17 1997/11/07 08:53:10 phk Exp $
+ * $Id: vfs_conf.c,v 1.19 1997/12/01 11:34:41 julian Exp $
  */
 
 /*
@@ -51,6 +51,8 @@
  *		as an aid to conversion for kernel multithreading
  *		on SMP reentrancy
  */
+#include "opt_bootp.h"
+
 #include <sys/param.h>		/* dev_t (types.h)*/
 #include <sys/kernel.h>
 #include <sys/systm.h>		/* rootvp*/
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index b5f9b259..4a103be 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.17 1997/11/07 08:53:10 phk Exp $
+ * $Id: vfs_conf.c,v 1.19 1997/12/01 11:34:41 julian Exp $
  */
 
 /*
@@ -51,6 +51,8 @@
  *		as an aid to conversion for kernel multithreading
  *		on SMP reentrancy
  */
+#include "opt_bootp.h"
+
 #include <sys/param.h>		/* dev_t (types.h)*/
 #include <sys/kernel.h>
 #include <sys/systm.h>		/* rootvp*/
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index f8cd538..504e86b 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,12 +31,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.71 1997/11/05 20:17:21 joerg Exp $
+ * $Id: ip_input.c,v 1.72 1997/11/13 22:57:57 julian Exp $
  *	$ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
  */
 
 #define	_IP_VHL
 
+#include "opt_bootp.h"
 #include "opt_ipfw.h"
 #include "opt_ipdivert.h"
 
diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c
index a1e909d..1b668e9 100644
--- a/sys/nfs/bootp_subr.c
+++ b/sys/nfs/bootp_subr.c
@@ -1,4 +1,4 @@
-/*	$Id: bootp_subr.c,v 1.5 1997/08/16 19:15:51 wollman Exp $	*/
+/*	$Id: bootp_subr.c,v 1.6 1997/10/28 15:59:02 bde Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -42,6 +42,8 @@
  *	$NetBSD: krpc_subr.c,v 1.10 1995/08/08 20:43:43 gwr Exp $
  */
 
+#include "opt_bootp.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index a1e909d..1b668e9 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -1,4 +1,4 @@
-/*	$Id: bootp_subr.c,v 1.5 1997/08/16 19:15:51 wollman Exp $	*/
+/*	$Id: bootp_subr.c,v 1.6 1997/10/28 15:59:02 bde Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -42,6 +42,8 @@
  *	$NetBSD: krpc_subr.c,v 1.10 1995/08/08 20:43:43 gwr Exp $
  */
 
+#include "opt_bootp.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>