summaryrefslogtreecommitdiffstats
path: root/sys/i386
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2004-07-28 21:54:57 +0000
committerphk <phk@FreeBSD.org>2004-07-28 21:54:57 +0000
commit98d8f3741c9752729a6684372287457a18580e7f (patch)
tree382896a8ecc11b588b13ee046bb420127036553a /sys/i386
parent72ff15d7fb39222cff16cf948d64041a4bcc043f (diff)
downloadFreeBSD-src-98d8f3741c9752729a6684372287457a18580e7f.zip
FreeBSD-src-98d8f3741c9752729a6684372287457a18580e7f.tar.gz
Move a relic to its correct location(s): Put nfs diskless initialization
calls with the code they call. (Yet another example of mindless copy&paste).
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/i386/autoconf.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index c213a68..c4eca30 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -45,8 +45,6 @@ __FBSDID("$FreeBSD$");
*/
#include "opt_bootp.h"
#include "opt_isa.h"
-#include "opt_nfs.h"
-#include "opt_nfsroot.h"
#include "opt_bus.h"
#include <sys/param.h>
@@ -66,10 +64,6 @@ __FBSDID("$FreeBSD$");
#include <net/if_var.h>
#include <net/ethernet.h>
#include <netinet/in.h>
-#include <nfs/rpcv2.h>
-#include <nfs/nfsproto.h>
-#include <nfsclient/nfs.h>
-#include <nfsclient/nfsdiskless.h>
#include <machine/bootinfo.h>
#include <machine/md_var.h>
@@ -174,22 +168,3 @@ configure_final(dummy)
}
cold = 0;
}
-
-/*
- * Do legacy root filesystem discovery.
- */
-void
-cpu_rootconf()
-{
-#ifdef BOOTP
- bootpc_init();
-#endif
-#if defined(NFSCLIENT) && defined(NFS_ROOT)
-#if !defined(BOOTP_NFSROOT)
- nfs_setup_diskless();
- if (nfs_diskless_valid)
-#endif
- rootdevnames[0] = "nfs:";
-#endif
-}
-SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL)
OpenPOWER on IntegriCloud