Consolidate NFS_BOOT_* options into opt_nfs_boot.h trunk
authorscottr <scottr@NetBSD.org>
Mon, 12 Jan 1998 21:27:09 +0000
branchtrunk
changeset 35903 47173de8c0fe
parent 35902 3ee06238e806
child 35904 397be5f888ad
Consolidate NFS_BOOT_* options into opt_nfs_boot.h
sys/conf/files
sys/nfs/nfs_boot.c
sys/nfs/nfs_bootdhcp.c
sys/nfs/nfs_bootparam.c
--- a/sys/conf/files	Mon Jan 12 21:21:45 1998 +0000
+++ b/sys/conf/files	Mon Jan 12 21:27:09 1998 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.162 1998/01/12 08:21:30 thorpej Exp $
+#	$NetBSD: files,v 1.163 1998/01/12 21:27:09 scottr Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -14,9 +14,8 @@
 defopt	SWAPPAGER
 defopt	VNODEPAGER
 
-defopt	NFS_BOOT_BOOTP
-defopt	NFS_BOOT_BOOTPARAM
-defopt	NFS_BOOT_DHCP
+defopt	opt_nfs_boot.h	NFS_BOOT_BOOTP NFS_BOOT_BOOTPARAM NFS_BOOT_DHCP
+			NFS_BOOT_GATEWAY
 
 defopt	MROUTING
 defopt	TCP_COMPAT_42
--- a/sys/nfs/nfs_boot.c	Mon Jan 12 21:21:45 1998 +0000
+++ b/sys/nfs/nfs_boot.c	Mon Jan 12 21:27:09 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_boot.c,v 1.41 1998/01/11 05:55:40 scottr Exp $	*/
+/*	$NetBSD: nfs_boot.c,v 1.42 1998/01/12 21:27:12 scottr Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -41,6 +41,8 @@
  * about where to mount root from, what pathnames, etc.
  */
 
+#include "opt_nfs_boot.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -69,10 +71,6 @@
 #include <nfs/nfsproto.h>
 #include <nfs/nfsdiskless.h>
 
-#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.
  * One implementation uses BOOTP (RFC951, RFC1048),
--- a/sys/nfs/nfs_bootdhcp.c	Mon Jan 12 21:21:45 1998 +0000
+++ b/sys/nfs/nfs_bootdhcp.c	Mon Jan 12 21:27:09 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_bootdhcp.c,v 1.4 1998/01/11 05:55:41 scottr Exp $	*/
+/*	$NetBSD: nfs_bootdhcp.c,v 1.5 1998/01/12 21:27:14 scottr Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -50,6 +50,8 @@
  * integrated it into the NetBSD sources during Aug 1997.
  */
 
+#include "opt_nfs_boot.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -77,8 +79,6 @@
 /* #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
--- a/sys/nfs/nfs_bootparam.c	Mon Jan 12 21:21:45 1998 +0000
+++ b/sys/nfs/nfs_bootparam.c	Mon Jan 12 21:27:09 1998 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_bootparam.c,v 1.5 1998/01/09 15:16:55 drochner Exp $	*/
+/*	$NetBSD: nfs_bootparam.c,v 1.6 1998/01/12 21:27:15 scottr Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -40,6 +40,8 @@
  * Support for NFS diskless booting, Sun-style (RPC/bootparams)
  */
 
+#include "opt_nfs_boot.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>