Fix the experimental NFS client so that it does not bogusly

set the f_flags field of "struct statfs". This had the interesting
effect of making the NFSv4 mounts "disappear" after r221014,
since NFSMNT_NFSV4 and MNT_IGNORE became the same bit.
Move the files used for a diskless NFS root from sys/nfsclient
to sys/nfs in preparation for them to be used by both NFS
clients. Also, move the declaration of the three global data
structures from sys/nfsclient/nfs_vfsops.c to sys/nfs/nfs_diskless.c
so that they are defined when either client uses them.

Reviewed by:	jhb
MFC after:	2 weeks

5 files changed, 2907 insertions, 0 deletions

diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c
new file mode 100644
index 0000000..ca90089
--- /dev/null
+++ b/sys/nfs/bootp_subr.c
@@ -0,0 +1,1867 @@
+/*-
+ * Copyright (c) 1995 Gordon Ross, Adam Glass
+ * Copyright (c) 1992 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This software was developed by the Computer Systems Engineering group
+ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ * contributed to Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Lawrence Berkeley Laboratory and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * based on:
+ *      nfs/krpc_subr.c
+ *	$NetBSD: krpc_subr.c,v 1.10 1995/08/08 20:43:43 gwr Exp $
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_bootp.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/jail.h>
+#include <sys/kernel.h>
+#include <sys/sockio.h>
+#include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/mbuf.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/sysctl.h>
+#include <sys/uio.h>
+
+#include <net/if.h>
+#include <net/route.h>
+
+#include <netinet/in.h>
+#include <net/if_types.h>
+#include <net/if_dl.h>
+#include <net/vnet.h>
+
+#include <nfs/nfsproto.h>
+#include <nfsclient/nfs.h>
+#include <nfs/nfsdiskless.h>
+#include <nfs/krpc.h>
+#include <nfs/xdr_subs.h>
+
+
+#define BOOTP_MIN_LEN		300	/* Minimum size of bootp udp packet */
+
+#ifndef BOOTP_SETTLE_DELAY
+#define BOOTP_SETTLE_DELAY 3
+#endif
+
+/*
+ * What is the longest we will wait before re-sending a request?
+ * Note this is also the frequency of "RPC timeout" messages.
+ * The re-send loop count sup linearly to this maximum, so the
+ * first complaint will happen after (1+2+3+4+5)=15 seconds.
+ */
+#define	MAX_RESEND_DELAY 5	/* seconds */
+
+/* Definitions from RFC951 */
+struct bootp_packet {
+	u_int8_t op;
+	u_int8_t htype;
+	u_int8_t hlen;
+	u_int8_t hops;
+	u_int32_t xid;
+	u_int16_t secs;
+	u_int16_t flags;
+	struct in_addr ciaddr;
+	struct in_addr yiaddr;
+	struct in_addr siaddr;
+	struct in_addr giaddr;
+	unsigned char chaddr[16];
+	char sname[64];
+	char file[128];
+	unsigned char vend[1222];
+};
+
+struct bootpc_ifcontext {
+	struct bootpc_ifcontext *next;
+	struct bootp_packet call;
+	struct bootp_packet reply;
+	int replylen;
+	int overload;
+	struct socket *so;
+	struct ifreq ireq;
+	struct ifnet *ifp;
+	struct sockaddr_dl *sdl;
+	struct sockaddr_in myaddr;
+	struct sockaddr_in netmask;
+	struct sockaddr_in gw;
+	struct sockaddr_in broadcast;	/* Different for each interface */
+	int gotgw;
+	int gotnetmask;
+	int gotrootpath;
+	int outstanding;
+	int sentmsg;
+	u_int32_t xid;
+	enum {
+		IF_BOOTP_UNRESOLVED,
+		IF_BOOTP_RESOLVED,
+		IF_BOOTP_FAILED,
+		IF_DHCP_UNRESOLVED,
+		IF_DHCP_OFFERED,
+		IF_DHCP_RESOLVED,
+		IF_DHCP_FAILED,
+	} state;
+	int dhcpquerytype;		/* dhcp type sent */
+	struct in_addr dhcpserver;
+	int gotdhcpserver;
+};
+
+#define TAG_MAXLEN 1024
+struct bootpc_tagcontext {
+	char buf[TAG_MAXLEN + 1];
+	int overload;
+	int badopt;
+	int badtag;
+	int foundopt;
+	int taglen;
+};
+
+struct bootpc_globalcontext {
+	struct bootpc_ifcontext *interfaces;
+	struct bootpc_ifcontext *lastinterface;
+	u_int32_t xid;
+	int gotrootpath;
+	int gotgw;
+	int ifnum;
+	int secs;
+	int starttime;
+	struct bootp_packet reply;
+	int replylen;
+	struct bootpc_ifcontext *setrootfs;
+	struct bootpc_ifcontext *sethostname;
+	struct bootpc_tagcontext tmptag;
+	struct bootpc_tagcontext tag;
+};
+
+#define IPPORT_BOOTPC 68
+#define IPPORT_BOOTPS 67
+
+#define BOOTP_REQUEST 1
+#define BOOTP_REPLY 2
+
+/* Common tags */
+#define TAG_PAD		  0  /* Pad option, implicit length 1 */
+#define TAG_SUBNETMASK	  1  /* RFC 950 subnet mask */
+#define TAG_ROUTERS	  3  /* Routers (in order of preference) */
+#define TAG_HOSTNAME	 12  /* Client host name */
+#define TAG_ROOT	 17  /* Root path */
+
+/* DHCP specific tags */
+#define TAG_OVERLOAD	 52  /* Option Overload */
+#define TAG_MAXMSGSIZE   57  /* Maximum DHCP Message Size */
+
+#define TAG_END		255  /* End Option (i.e. no more options) */
+
+/* Overload values */
+#define OVERLOAD_FILE     1
+#define OVERLOAD_SNAME    2
+
+/* Site specific tags: */
+#define TAG_ROOTOPTS	130
+#define TAG_COOKIE	134	/* ascii info for userland, via sysctl */
+
+#define TAG_DHCP_MSGTYPE 53
+#define TAG_DHCP_REQ_ADDR 50
+#define TAG_DHCP_SERVERID 54
+#define TAG_DHCP_LEASETIME 51
+
+#define TAG_VENDOR_INDENTIFIER 60
+
+#define DHCP_NOMSG    0
+#define DHCP_DISCOVER 1
+#define DHCP_OFFER    2
+#define DHCP_REQUEST  3
+#define DHCP_ACK      5
+
+/* NFS read/write block size */
+#ifndef BOOTP_BLOCKSIZE
+#define	BOOTP_BLOCKSIZE	8192
+#endif
+
+static char bootp_cookie[128];
+SYSCTL_STRING(_kern, OID_AUTO, bootp_cookie, CTLFLAG_RD,
+	bootp_cookie, 0, "Cookie (T134) supplied by bootp server");
+
+/* mountd RPC */
+static int	md_mount(struct sockaddr_in *mdsin, char *path, u_char *fhp,
+		    int *fhsizep, struct nfs_args *args, struct thread *td);
+static int	setfs(struct sockaddr_in *addr, char *path, char *p,
+		    const struct in_addr *siaddr);
+static int	getdec(char **ptr);
+static int	getip(char **ptr, struct in_addr *ip);
+static void	mountopts(struct nfs_args *args, char *p);
+static int	xdr_opaque_decode(struct mbuf **ptr, u_char *buf, int len);
+static int	xdr_int_decode(struct mbuf **ptr, int *iptr);
+static void	print_in_addr(struct in_addr addr);
+static void	print_sin_addr(struct sockaddr_in *addr);
+static void	clear_sinaddr(struct sockaddr_in *sin);
+static void	allocifctx(struct bootpc_globalcontext *gctx);
+static void	bootpc_compose_query(struct bootpc_ifcontext *ifctx,
+		    struct bootpc_globalcontext *gctx, struct thread *td);
+static unsigned char *bootpc_tag(struct bootpc_tagcontext *tctx,
+		    struct bootp_packet *bp, int len, int tag);
+static void bootpc_tag_helper(struct bootpc_tagcontext *tctx,
+		    unsigned char *start, int len, int tag);
+
+#ifdef BOOTP_DEBUG
+void bootpboot_p_sa(struct sockaddr *sa, struct sockaddr *ma);
+void bootpboot_p_rtentry(struct rtentry *rt);
+void bootpboot_p_tree(struct radix_node *rn);
+void bootpboot_p_rtlist(void);
+void bootpboot_p_if(struct ifnet *ifp, struct ifaddr *ifa);
+void bootpboot_p_iflist(void);
+#endif
+
+static int	bootpc_call(struct bootpc_globalcontext *gctx,
+		    struct thread *td);
+
+static int	bootpc_fakeup_interface(struct bootpc_ifcontext *ifctx,
+		    struct bootpc_globalcontext *gctx, struct thread *td);
+
+static int	bootpc_adjust_interface(struct bootpc_ifcontext *ifctx,
+		    struct bootpc_globalcontext *gctx, struct thread *td);
+
+static void	bootpc_decode_reply(struct nfsv3_diskless *nd,
+		    struct bootpc_ifcontext *ifctx,
+		    struct bootpc_globalcontext *gctx);
+
+static int	bootpc_received(struct bootpc_globalcontext *gctx,
+		    struct bootpc_ifcontext *ifctx);
+
+static __inline int bootpc_ifctx_isresolved(struct bootpc_ifcontext *ifctx);
+static __inline int bootpc_ifctx_isunresolved(struct bootpc_ifcontext *ifctx);
+static __inline int bootpc_ifctx_isfailed(struct bootpc_ifcontext *ifctx);
+
+/*
+ * In order to have multiple active interfaces with address 0.0.0.0
+ * and be able to send data to a selected interface, we perform
+ * some tricks:
+ *
+ *  - The 'broadcast' address is different for each interface.
+ *
+ *  - We temporarily add routing pointing 255.255.255.255 to the
+ *    selected interface broadcast address, thus the packet sent
+ *    goes to that interface.
+ */
+
+#ifdef BOOTP_DEBUG
+void
+bootpboot_p_sa(struct sockaddr *sa, struct sockaddr *ma)
+{
+
+	if (sa == NULL) {
+		printf("(sockaddr *) <null>");
+		return;
+	}
+	switch (sa->sa_family) {
+	case AF_INET:
+	{
+		struct sockaddr_in *sin;
+
+		sin = (struct sockaddr_in *) sa;
+		printf("inet ");
+		print_sin_addr(sin);
+		if (ma != NULL) {
+			sin = (struct sockaddr_in *) ma;
+			printf(" mask ");
+			print_sin_addr(sin);
+		}
+	}
+	break;
+	case AF_LINK:
+	{
+		struct sockaddr_dl *sli;
+		int i;
+
+		sli = (struct sockaddr_dl *) sa;
+		printf("link %.*s ", sli->sdl_nlen, sli->sdl_data);
+		for (i = 0; i < sli->sdl_alen; i++) {
+			if (i > 0)
+				printf(":");
+			printf("%x", ((unsigned char *) LLADDR(sli))[i]);
+		}
+	}
+	break;
+	default:
+		printf("af%d", sa->sa_family);
+	}
+}
+
+void
+bootpboot_p_rtentry(struct rtentry *rt)
+{
+
+	bootpboot_p_sa(rt_key(rt), rt_mask(rt));
+	printf(" ");
+	bootpboot_p_sa(rt->rt_gateway, NULL);
+	printf(" ");
+	printf("flags %x", (unsigned short) rt->rt_flags);
+	printf(" %d", (int) rt->rt_rmx.rmx_expire);
+	printf(" %s\n", rt->rt_ifp->if_xname);
+}
+
+void
+bootpboot_p_tree(struct radix_node *rn)
+{
+
+	while (rn != NULL) {
+		if (rn->rn_bit < 0) {
+			if ((rn->rn_flags & RNF_ROOT) != 0) {
+			} else {
+				bootpboot_p_rtentry((struct rtentry *) rn);
+			}
+			rn = rn->rn_dupedkey;
+		} else {
+			bootpboot_p_tree(rn->rn_left);
+			bootpboot_p_tree(rn->rn_right);
+			return;
+		}
+	}
+}
+
+void
+bootpboot_p_rtlist(void)
+{
+	struct radix_node_head *rnh;
+
+	printf("Routing table:\n");
+	rnh = rt_tables_get_rnh(0, AF_INET);
+	if (rnh == NULL)
+		return;
+	RADIX_NODE_HEAD_RLOCK(rnh);	/* could sleep XXX */
+	bootpboot_p_tree(rnh->rnh_treetop);
+	RADIX_NODE_HEAD_RUNLOCK(rnh);
+}
+
+void
+bootpboot_p_if(struct ifnet *ifp, struct ifaddr *ifa)
+{
+
+	printf("%s flags %x, addr ",
+	       ifp->if_xname, ifp->if_flags);
+	print_sin_addr((struct sockaddr_in *) ifa->ifa_addr);
+	printf(", broadcast ");
+	print_sin_addr((struct sockaddr_in *) ifa->ifa_dstaddr);
+	printf(", netmask ");
+	print_sin_addr((struct sockaddr_in *) ifa->ifa_netmask);
+	printf("\n");
+}
+
+void
+bootpboot_p_iflist(void)
+{
+	struct ifnet *ifp;
+	struct ifaddr *ifa;
+
+	printf("Interface list:\n");
+	IFNET_RLOCK();
+	for (ifp = TAILQ_FIRST(&V_ifnet);
+	     ifp != NULL;
+	     ifp = TAILQ_NEXT(ifp, if_link)) {
+		for (ifa = TAILQ_FIRST(&ifp->if_addrhead);
+		     ifa != NULL;
+		     ifa = TAILQ_NEXT(ifa, ifa_link))
+			if (ifa->ifa_addr->sa_family == AF_INET)
+				bootpboot_p_if(ifp, ifa);
+	}
+	IFNET_RUNLOCK();
+}
+#endif /* defined(BOOTP_DEBUG) */
+
+static void
+clear_sinaddr(struct sockaddr_in *sin)
+{
+
+	bzero(sin, sizeof(*sin));
+	sin->sin_len = sizeof(*sin);
+	sin->sin_family = AF_INET;
+	sin->sin_addr.s_addr = INADDR_ANY; /* XXX: htonl(INAADDR_ANY) ? */
+	sin->sin_port = 0;
+}
+
+static void
+allocifctx(struct bootpc_globalcontext *gctx)
+{
+	struct bootpc_ifcontext *ifctx;
+	ifctx = (struct bootpc_ifcontext *) malloc(sizeof(*ifctx),
+						   M_TEMP, M_WAITOK | M_ZERO);
+	if (ifctx == NULL)
+		panic("Failed to allocate bootp interface context structure");
+
+	ifctx->xid = gctx->xid;
+#ifdef BOOTP_NO_DHCP
+	ifctx->state = IF_BOOTP_UNRESOLVED;
+#else
+	ifctx->state = IF_DHCP_UNRESOLVED;
+#endif
+	gctx->xid += 0x100;
+	if (gctx->interfaces != NULL)
+		gctx->lastinterface->next = ifctx;
+	else
+		gctx->interfaces = ifctx;
+	gctx->lastinterface = ifctx;
+}
+
+static __inline int
+bootpc_ifctx_isresolved(struct bootpc_ifcontext *ifctx)
+{
+
+	if (ifctx->state == IF_BOOTP_RESOLVED ||
+	    ifctx->state == IF_DHCP_RESOLVED)
+		return 1;
+	return 0;
+}
+
+static __inline int
+bootpc_ifctx_isunresolved(struct bootpc_ifcontext *ifctx)
+{
+
+	if (ifctx->state == IF_BOOTP_UNRESOLVED ||
+	    ifctx->state == IF_DHCP_UNRESOLVED)
+		return 1;
+	return 0;
+}
+
+static __inline int
+bootpc_ifctx_isfailed(struct bootpc_ifcontext *ifctx)
+{
+
+	if (ifctx->state == IF_BOOTP_FAILED ||
+	    ifctx->state == IF_DHCP_FAILED)
+		return 1;
+	return 0;
+}
+
+static int
+bootpc_received(struct bootpc_globalcontext *gctx,
+    struct bootpc_ifcontext *ifctx)
+{
+	unsigned char dhcpreplytype;
+	char *p;
+
+	/*
+	 * Need timeout for fallback to less
+	 * desirable alternative.
+	 */
+
+	/* This call used for the side effect (badopt flag) */
+	(void) bootpc_tag(&gctx->tmptag, &gctx->reply,
+			  gctx->replylen,
+			  TAG_END);
+
+	/* If packet is invalid, ignore it */
+	if (gctx->tmptag.badopt != 0)
+		return 0;
+
+	p = bootpc_tag(&gctx->tmptag, &gctx->reply,
+		       gctx->replylen, TAG_DHCP_MSGTYPE);
+	if (p != NULL)
+		dhcpreplytype = *p;
+	else
+		dhcpreplytype = DHCP_NOMSG;
+
+	switch (ifctx->dhcpquerytype) {
+	case DHCP_DISCOVER:
+		if (dhcpreplytype != DHCP_OFFER 	/* Normal DHCP offer */
+#ifndef BOOTP_FORCE_DHCP
+		    && dhcpreplytype != DHCP_NOMSG	/* Fallback to BOOTP */
+#endif
+			)
+			return 0;
+		break;
+	case DHCP_REQUEST:
+		if (dhcpreplytype != DHCP_ACK)
+			return 0;
+	case DHCP_NOMSG:
+		break;
+	}
+
+	/* Ignore packet unless it gives us a root tag we didn't have */
+
+	if ((ifctx->state == IF_BOOTP_RESOLVED ||
+	     (ifctx->dhcpquerytype == DHCP_DISCOVER &&
+	      (ifctx->state == IF_DHCP_OFFERED ||
+	       ifctx->state == IF_DHCP_RESOLVED))) &&
+	    (bootpc_tag(&gctx->tmptag, &ifctx->reply,
+			ifctx->replylen,
+			TAG_ROOT) != NULL ||
+	     bootpc_tag(&gctx->tmptag, &gctx->reply,
+			gctx->replylen,
+			TAG_ROOT) == NULL))
+		return 0;
+
+	bcopy(&gctx->reply, &ifctx->reply, gctx->replylen);
+	ifctx->replylen = gctx->replylen;
+
+	/* XXX: Only reset if 'perfect' response */
+	if (ifctx->state == IF_BOOTP_UNRESOLVED)
+		ifctx->state = IF_BOOTP_RESOLVED;
+	else if (ifctx->state == IF_DHCP_UNRESOLVED &&
+		 ifctx->dhcpquerytype == DHCP_DISCOVER) {
+		if (dhcpreplytype == DHCP_OFFER)
+			ifctx->state = IF_DHCP_OFFERED;
+		else
+			ifctx->state = IF_BOOTP_RESOLVED;	/* Fallback */
+	} else if (ifctx->state == IF_DHCP_OFFERED &&
+		   ifctx->dhcpquerytype == DHCP_REQUEST)
+		ifctx->state = IF_DHCP_RESOLVED;
+
+
+	if (ifctx->dhcpquerytype == DHCP_DISCOVER &&
+	    ifctx->state != IF_BOOTP_RESOLVED) {
+		p = bootpc_tag(&gctx->tmptag, &ifctx->reply,
+			       ifctx->replylen, TAG_DHCP_SERVERID);
+		if (p != NULL && gctx->tmptag.taglen == 4) {
+			memcpy(&ifctx->dhcpserver, p, 4);
+			ifctx->gotdhcpserver = 1;
+		} else
+			ifctx->gotdhcpserver = 0;
+		return 1;
+	}
+
+	ifctx->gotrootpath = (bootpc_tag(&gctx->tmptag, &ifctx->reply,
+					 ifctx->replylen,
+					 TAG_ROOT) != NULL);
+	ifctx->gotgw = (bootpc_tag(&gctx->tmptag, &ifctx->reply,
+				   ifctx->replylen,
+				   TAG_ROUTERS) != NULL);
+	ifctx->gotnetmask = (bootpc_tag(&gctx->tmptag, &ifctx->reply,
+					ifctx->replylen,
+					TAG_SUBNETMASK) != NULL);
+	return 1;
+}
+
+static int
+bootpc_call(struct bootpc_globalcontext *gctx, struct thread *td)
+{
+	struct socket *so;
+	struct sockaddr_in *sin, dst;
+	struct uio auio;
+	struct sockopt sopt;
+	struct iovec aio;
+	int error, on, rcvflg, timo, len;
+	time_t atimo;
+	time_t rtimo;
+	struct timeval tv;
+	struct bootpc_ifcontext *ifctx;
+	int outstanding;
+	int gotrootpath;
+	int retry;
+	const char *s;
+
+	/*
+	 * Create socket and set its recieve timeout.
+	 */
+	error = socreate(AF_INET, &so, SOCK_DGRAM, 0, td->td_ucred, td);
+	if (error != 0)
+		goto out0;
+
+	tv.tv_sec = 1;
+	tv.tv_usec = 0;
+	bzero(&sopt, sizeof(sopt));
+	sopt.sopt_dir = SOPT_SET;
+	sopt.sopt_level = SOL_SOCKET;
+	sopt.sopt_name = SO_RCVTIMEO;
+	sopt.sopt_val = &tv;
+	sopt.sopt_valsize = sizeof tv;
+
+	error = sosetopt(so, &sopt);
+	if (error != 0)
+		goto out;
+
+	/*
+	 * Enable broadcast.
+	 */
+	on = 1;
+	sopt.sopt_name = SO_BROADCAST;
+	sopt.sopt_val = &on;
+	sopt.sopt_valsize = sizeof on;
+
+	error = sosetopt(so, &sopt);
+	if (error != 0)
+		goto out;
+
+	/*
+	 * Disable routing.
+	 */
+
+	on = 1;
+	sopt.sopt_name = SO_DONTROUTE;
+	sopt.sopt_val = &on;
+	sopt.sopt_valsize = sizeof on;
+
+	error = sosetopt(so, &sopt);
+	if (error != 0)
+		goto out;
+
+	/*
+	 * Bind the local endpoint to a bootp client port.
+	 */
+	sin = &dst;
+	clear_sinaddr(sin);
+	sin->sin_port = htons(IPPORT_BOOTPC);
+	error = sobind(so, (struct sockaddr *)sin, td);
+	if (error != 0) {
+		printf("bind failed\n");
+		goto out;
+	}
+
+	/*
+	 * Setup socket address for the server.
+	 */
+	sin = &dst;
+	clear_sinaddr(sin);
+	sin->sin_addr.s_addr = INADDR_BROADCAST;
+	sin->sin_port = htons(IPPORT_BOOTPS);
+
+	/*
+	 * Send it, repeatedly, until a reply is received,
+	 * but delay each re-send by an increasing amount.
+	 * If the delay hits the maximum, start complaining.
+	 */
+	timo = 0;
+	rtimo = 0;
+	for (;;) {
+
+		outstanding = 0;
+		gotrootpath = 0;
+
+		for (ifctx = gctx->interfaces;
+		     ifctx != NULL;
+		     ifctx = ifctx->next) {
+			if (bootpc_ifctx_isresolved(ifctx) != 0 &&
+			    bootpc_tag(&gctx->tmptag, &ifctx->reply,
+				       ifctx->replylen,
+				       TAG_ROOT) != NULL)
+				gotrootpath = 1;
+		}
+
+		for (ifctx = gctx->interfaces;
+		     ifctx != NULL;
+		     ifctx = ifctx->next) {
+			ifctx->outstanding = 0;
+			if (bootpc_ifctx_isresolved(ifctx)  != 0 &&
+			    gotrootpath != 0) {
+				continue;
+			}
+			if (bootpc_ifctx_isfailed(ifctx) != 0)
+				continue;
+
+			outstanding++;
+			ifctx->outstanding = 1;
+
+			/* Proceed to next step in DHCP negotiation */
+			if ((ifctx->state == IF_DHCP_OFFERED &&
+			     ifctx->dhcpquerytype != DHCP_REQUEST) ||
+			    (ifctx->state == IF_DHCP_UNRESOLVED &&
+			     ifctx->dhcpquerytype != DHCP_DISCOVER) ||
+			    (ifctx->state == IF_BOOTP_UNRESOLVED &&
+			     ifctx->dhcpquerytype != DHCP_NOMSG)) {
+				ifctx->sentmsg = 0;
+				bootpc_compose_query(ifctx, gctx, td);
+			}
+
+			/* Send BOOTP request (or re-send). */
+
+			if (ifctx->sentmsg == 0) {
+				switch(ifctx->dhcpquerytype) {
+				case DHCP_DISCOVER:
+					s = "DHCP Discover";
+					break;
+				case DHCP_REQUEST:
+					s = "DHCP Request";
+					break;
+				case DHCP_NOMSG:
+				default:
+					s = "BOOTP Query";
+					break;
+				}
+				printf("Sending %s packet from "
+				       "interface %s (%*D)\n",
+				       s,
+				       ifctx->ireq.ifr_name,
+				       ifctx->sdl->sdl_alen,
+				       (unsigned char *) LLADDR(ifctx->sdl),
+				       ":");
+				ifctx->sentmsg = 1;
+			}
+
+			aio.iov_base = (caddr_t) &ifctx->call;
+			aio.iov_len = sizeof(ifctx->call);
+
+			auio.uio_iov = &aio;
+			auio.uio_iovcnt = 1;
+			auio.uio_segflg = UIO_SYSSPACE;
+			auio.uio_rw = UIO_WRITE;
+			auio.uio_offset = 0;
+			auio.uio_resid = sizeof(ifctx->call);
+			auio.uio_td = td;
+
+			/* Set netmask to 0.0.0.0 */
+
+			sin = (struct sockaddr_in *) &ifctx->ireq.ifr_addr;
+			clear_sinaddr(sin);
+			error = ifioctl(ifctx->so, SIOCSIFNETMASK,
+					(caddr_t) &ifctx->ireq, td);
+			if (error != 0)
+				panic("bootpc_call:"
+				      "set if netmask, error=%d",
+				      error);
+
+			error = sosend(so, (struct sockaddr *) &dst,
+				       &auio, NULL, NULL, 0, td);
+			if (error != 0) {
+				printf("bootpc_call: sosend: %d state %08x\n",
+				       error, (int) so->so_state);
+			}
+
+			/* XXX: Is this needed ? */
+			pause("bootpw", hz/10);
+
+			/* Set netmask to 255.0.0.0 */
+
+			sin = (struct sockaddr_in *) &ifctx->ireq.ifr_addr;
+			clear_sinaddr(sin);
+			sin->sin_addr.s_addr = htonl(0xff000000u);
+			error = ifioctl(ifctx->so, SIOCSIFNETMASK,
+					(caddr_t) &ifctx->ireq, td);
+			if (error != 0)
+				panic("bootpc_call:"
+				      "set if netmask, error=%d",
+				      error);
+
+		}
+
+		if (outstanding == 0 &&
+		    (rtimo == 0 || time_second >= rtimo)) {
+			error = 0;
+			goto gotreply;
+		}
+
+		/* Determine new timeout. */
+		if (timo < MAX_RESEND_DELAY)
+			timo++;
+		else {
+			printf("DHCP/BOOTP timeout for server ");
+			print_sin_addr(&dst);
+			printf("\n");
+		}
+
+		/*
+		 * Wait for up to timo seconds for a reply.
+		 * The socket receive timeout was set to 1 second.
+		 */
+		atimo = timo + time_second;
+		while (time_second < atimo) {
+			aio.iov_base = (caddr_t) &gctx->reply;
+			aio.iov_len = sizeof(gctx->reply);
+
+			auio.uio_iov = &aio;
+			auio.uio_iovcnt = 1;
+			auio.uio_segflg = UIO_SYSSPACE;
+			auio.uio_rw = UIO_READ;
+			auio.uio_offset = 0;
+			auio.uio_resid = sizeof(gctx->reply);
+			auio.uio_td = td;
+
+			rcvflg = 0;
+			error = soreceive(so, NULL, &auio,
+					  NULL, NULL, &rcvflg);
+			gctx->secs = time_second - gctx->starttime;
+			for (ifctx = gctx->interfaces;
+			     ifctx != NULL;
+			     ifctx = ifctx->next) {
+				if (bootpc_ifctx_isresolved(ifctx) != 0 ||
+				    bootpc_ifctx_isfailed(ifctx) != 0)
+					continue;
+
+				ifctx->call.secs = htons(gctx->secs);
+			}
+			if (error == EWOULDBLOCK)
+				continue;
+			if (error != 0)
+				goto out;
+			len = sizeof(gctx->reply) - auio.uio_resid;
+
+			/* Do we have the required number of bytes ? */
+			if (len < BOOTP_MIN_LEN)
+				continue;
+			gctx->replylen = len;
+
+			/* Is it a reply? */
+			if (gctx->reply.op != BOOTP_REPLY)
+				continue;
+
+			/* Is this an answer to our query */
+			for (ifctx = gctx->interfaces;
+			     ifctx != NULL;
+			     ifctx = ifctx->next) {
+				if (gctx->reply.xid != ifctx->call.xid)
+					continue;
+
+				/* Same HW address size ? */
+				if (gctx->reply.hlen != ifctx->call.hlen)
+					continue;
+
+				/* Correct HW address ? */
+				if (bcmp(gctx->reply.chaddr,
+					 ifctx->call.chaddr,
+					 ifctx->call.hlen) != 0)
+					continue;
+
+				break;
+			}
+
+			if (ifctx != NULL) {
+				s =  bootpc_tag(&gctx->tmptag,
+						&gctx->reply,
+						gctx->replylen,
+						TAG_DHCP_MSGTYPE);
+				if (s != NULL) {
+					switch (*s) {
+					case DHCP_OFFER:
+						s = "DHCP Offer";
+						break;
+					case DHCP_ACK:
+						s = "DHCP Ack";
+						break;
+					default:
+						s = "DHCP (unexpected)";
+						break;
+					}
+				} else
+					s = "BOOTP Reply";
+
+				printf("Received %s packet"
+				       " on %s from ",
+				       s,
+				       ifctx->ireq.ifr_name);
+				print_in_addr(gctx->reply.siaddr);
+				if (gctx->reply.giaddr.s_addr !=
+				    htonl(INADDR_ANY)) {
+					printf(" via ");
+					print_in_addr(gctx->reply.giaddr);
+				}
+				if (bootpc_received(gctx, ifctx) != 0) {
+					printf(" (accepted)");
+					if (ifctx->outstanding) {
+						ifctx->outstanding = 0;
+						outstanding--;
+					}
+					/* Network settle delay */
+					if (outstanding == 0)
+						atimo = time_second +
+							BOOTP_SETTLE_DELAY;
+				} else
+					printf(" (ignored)");
+				if (ifctx->gotrootpath) {
+					gotrootpath = 1;
+					rtimo = time_second +
+						BOOTP_SETTLE_DELAY;
+					printf(" (got root path)");
+				} else
+					printf(" (no root path)");
+				printf("\n");
+			}
+		} /* while secs */
+#ifdef BOOTP_TIMEOUT
+		if (gctx->secs > BOOTP_TIMEOUT && BOOTP_TIMEOUT > 0)
+			break;
+#endif
+		/* Force a retry if halfway in DHCP negotiation */
+		retry = 0;
+		for (ifctx = gctx->interfaces; ifctx != NULL;
+		     ifctx = ifctx->next) {
+			if (ifctx->state == IF_DHCP_OFFERED) {
+				if (ifctx->dhcpquerytype == DHCP_DISCOVER)
+					retry = 1;
+				else
+					ifctx->state = IF_DHCP_UNRESOLVED;
+			}
+		}
+
+		if (retry != 0)
+			continue;
+
+		if (gotrootpath != 0) {
+			gctx->gotrootpath = gotrootpath;
+			if (rtimo != 0 && time_second >= rtimo)
+				break;
+		}
+	} /* forever send/receive */
+
+	/*
+	 * XXX: These are errors of varying seriousness being silently
+	 * ignored
+	 */
+
+	for (ifctx = gctx->interfaces; ifctx != NULL; ifctx = ifctx->next) {
+		if (bootpc_ifctx_isresolved(ifctx) == 0) {
+			printf("%s timeout for interface %s\n",
+			       ifctx->dhcpquerytype != DHCP_NOMSG ?
+			       "DHCP" : "BOOTP",
+			       ifctx->ireq.ifr_name);
+		}
+	}
+	if (gctx->gotrootpath != 0) {
+#if 0
+		printf("Got a root path, ignoring remaining timeout\n");
+#endif
+		error = 0;
+		goto out;
+	}
+#ifndef BOOTP_NFSROOT
+	for (ifctx = gctx->interfaces; ifctx != NULL; ifctx = ifctx->next) {
+		if (bootpc_ifctx_isresolved(ifctx) != 0) {
+			error = 0;
+			goto out;
+		}
+	}
+#endif
+	error = ETIMEDOUT;
+	goto out;
+
+gotreply:
+out:
+	soclose(so);
+out0:
+	return error;
+}
+
+static int
+bootpc_fakeup_interface(struct bootpc_ifcontext *ifctx,
+    struct bootpc_globalcontext *gctx, struct thread *td)
+{
+	struct sockaddr_in *sin;
+	int error;
+	struct ifreq *ireq;
+	struct socket *so;
+	struct ifaddr *ifa;
+	struct sockaddr_dl *sdl;
+
+	error = socreate(AF_INET, &ifctx->so, SOCK_DGRAM, 0, td->td_ucred, td);
+	if (error != 0)
+		panic("nfs_boot: socreate, error=%d", error);
+
+	ireq = &ifctx->ireq;
+	so = ifctx->so;
+
+	/*
+	 * Bring up the interface.
+	 *
+	 * Get the old interface flags and or IFF_UP into them; if
+	 * IFF_UP set blindly, interface selection can be clobbered.
+	 */
+	error = ifioctl(so, SIOCGIFFLAGS, (caddr_t)ireq, td);
+	if (error != 0)
+		panic("bootpc_fakeup_interface: GIFFLAGS, error=%d", error);
+	ireq->ifr_flags |= IFF_UP;
+	error = ifioctl(so, SIOCSIFFLAGS, (caddr_t)ireq, td);
+	if (error != 0)
+		panic("bootpc_fakeup_interface: SIFFLAGS, error=%d", error);
+
+	/*
+	 * Do enough of ifconfig(8) so that the chosen interface
+	 * can talk to the servers.  (just set the address)
+	 */
+
+	/* addr is 0.0.0.0 */
+
+	sin = (struct sockaddr_in *) &ireq->ifr_addr;
+	clear_sinaddr(sin);
+	error = ifioctl(so, SIOCSIFADDR, (caddr_t) ireq, td);
+	if (error != 0 && (error != EEXIST || ifctx == gctx->interfaces))
+		panic("bootpc_fakeup_interface: "
+		      "set if addr, error=%d", error);
+
+	/* netmask is 255.0.0.0 */
+
+	sin = (struct sockaddr_in *) &ireq->ifr_addr;
+	clear_sinaddr(sin);
+	sin->sin_addr.s_addr = htonl(0xff000000u);
+	error = ifioctl(so, SIOCSIFNETMASK, (caddr_t)ireq, td);
+	if (error != 0)
+		panic("bootpc_fakeup_interface: set if netmask, error=%d",
+		      error);
+
+	/* Broadcast is 255.255.255.255 */
+
+	sin = (struct sockaddr_in *)&ireq->ifr_addr;
+	clear_sinaddr(sin);
+	clear_sinaddr(&ifctx->broadcast);
+	sin->sin_addr.s_addr = htonl(INADDR_BROADCAST);
+	ifctx->broadcast.sin_addr.s_addr = sin->sin_addr.s_addr;
+
+	error = ifioctl(so, SIOCSIFBRDADDR, (caddr_t)ireq, td);
+	if (error != 0)
+		panic("bootpc_fakeup_interface: "
+		      "set if broadcast addr, error=%d",
+		      error);
+
+	/* Get HW address */
+
+	sdl = NULL;
+	TAILQ_FOREACH(ifa, &ifctx->ifp->if_addrhead, ifa_link)
+		if (ifa->ifa_addr->sa_family == AF_LINK) {
+			sdl = (struct sockaddr_dl *)ifa->ifa_addr;
+			if (sdl->sdl_type == IFT_ETHER)
+				break;
+		}
+
+	if (sdl == NULL)
+		panic("bootpc: Unable to find HW address for %s",
+		      ifctx->ireq.ifr_name);
+	ifctx->sdl = sdl;
+
+	return error;
+}
+
+
+static int
+bootpc_adjust_interface(struct bootpc_ifcontext *ifctx,
+    struct bootpc_globalcontext *gctx, struct thread *td)
+{
+	int error;
+	struct sockaddr_in defdst;
+	struct sockaddr_in defmask;
+	struct sockaddr_in *sin;
+	struct ifreq *ireq;
+	struct socket *so;
+	struct sockaddr_in *myaddr;
+	struct sockaddr_in *netmask;
+	struct sockaddr_in *gw;
+
+	ireq = &ifctx->ireq;
+	so = ifctx->so;
+	myaddr = &ifctx->myaddr;
+	netmask = &ifctx->netmask;
+	gw = &ifctx->gw;
+
+	if (bootpc_ifctx_isresolved(ifctx) == 0) {
+
+		/* Shutdown interfaces where BOOTP failed */
+
+		printf("Shutdown interface %s\n", ifctx->ireq.ifr_name);
+		error = ifioctl(so, SIOCGIFFLAGS, (caddr_t)ireq, td);
+		if (error != 0)
+			panic("bootpc_adjust_interface: "
+			      "SIOCGIFFLAGS, error=%d", error);
+		ireq->ifr_flags &= ~IFF_UP;
+		error = ifioctl(so, SIOCSIFFLAGS, (caddr_t)ireq, td);
+		if (error != 0)
+			panic("bootpc_adjust_interface: "
+			      "SIOCSIFFLAGS, error=%d", error);
+
+		sin = (struct sockaddr_in *) &ireq->ifr_addr;
+		clear_sinaddr(sin);
+		error = ifioctl(so, SIOCDIFADDR, (caddr_t) ireq, td);
+		if (error != 0 && (error != EEXIST ||
+				   ifctx == gctx->interfaces))
+			panic("bootpc_adjust_interface: "
+			      "SIOCDIFADDR, error=%d", error);
+
+		return 0;
+	}
+
+	printf("Adjusted interface %s\n", ifctx->ireq.ifr_name);
+	/*
+	 * Do enough of ifconfig(8) so that the chosen interface
+	 * can talk to the servers.  (just set the address)
+	 */
+	bcopy(netmask, &ireq->ifr_addr, sizeof(*netmask));
+	error = ifioctl(so, SIOCSIFNETMASK, (caddr_t) ireq, td);
+	if (error != 0)
+		panic("bootpc_adjust_interface: "
+		      "set if netmask, error=%d", error);
+
+	/* Broadcast is with host part of IP address all 1's */
+
+	sin = (struct sockaddr_in *) &ireq->ifr_addr;
+	clear_sinaddr(sin);
+	sin->sin_addr.s_addr = myaddr->sin_addr.s_addr |
+		~ netmask->sin_addr.s_addr;
+	error = ifioctl(so, SIOCSIFBRDADDR, (caddr_t) ireq, td);
+	if (error != 0)
+		panic("bootpc_adjust_interface: "
+		      "set if broadcast addr, error=%d", error);
+
+	bcopy(myaddr, &ireq->ifr_addr, sizeof(*myaddr));
+	error = ifioctl(so, SIOCSIFADDR, (caddr_t) ireq, td);
+	if (error != 0 && (error != EEXIST || ifctx == gctx->interfaces))
+		panic("bootpc_adjust_interface: "
+		      "set if addr, error=%d", error);
+
+	/* Add new default route */
+
+	if (ifctx->gotgw != 0 || gctx->gotgw == 0) {
+		clear_sinaddr(&defdst);
+		clear_sinaddr(&defmask);
+		/* XXX MRT just table 0 */
+		error = rtrequest_fib(RTM_ADD,
+				  (struct sockaddr *) &defdst,
+				  (struct sockaddr *) gw,
+				  (struct sockaddr *) &defmask,
+				  (RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL, 0);
+		if (error != 0) {
+			printf("bootpc_adjust_interface: "
+			       "add net route, error=%d\n", error);
+			return error;
+		}
+	}
+
+	return 0;
+}
+
+static int
+setfs(struct sockaddr_in *addr, char *path, char *p,
+    const struct in_addr *siaddr)
+{
+
+	if (getip(&p, &addr->sin_addr) == 0) {
+		if (siaddr != NULL && *p == '/')
+			bcopy(siaddr, &addr->sin_addr, sizeof(struct in_addr));
+		else
+			return 0;
+	} else {
+		if (*p != ':')
+			return 0;
+		p++;
+	}
+		
+	addr->sin_len = sizeof(struct sockaddr_in);
+	addr->sin_family = AF_INET;
+
+	strlcpy(path, p, MNAMELEN);
+	return 1;
+}
+
+static int
+getip(char **ptr, struct in_addr *addr)
+{
+	char *p;
+	unsigned int ip;
+	int val;
+
+	p = *ptr;
+	ip = 0;
+	if (((val = getdec(&p)) < 0) || (val > 255))
+		return 0;
+	ip = val << 24;
+	if (*p != '.')
+		return 0;
+	p++;
+	if (((val = getdec(&p)) < 0) || (val > 255))
+		return 0;
+	ip |= (val << 16);
+	if (*p != '.')
+		return 0;
+	p++;
+	if (((val = getdec(&p)) < 0) || (val > 255))
+		return 0;
+	ip |= (val << 8);
+	if (*p != '.')
+		return 0;
+	p++;
+	if (((val = getdec(&p)) < 0) || (val > 255))
+		return 0;
+	ip |= val;
+
+	addr->s_addr = htonl(ip);
+	*ptr = p;
+	return 1;
+}
+
+static int
+getdec(char **ptr)
+{
+	char *p;
+	int ret;
+
+	p = *ptr;
+	ret = 0;
+	if ((*p < '0') || (*p > '9'))
+		return -1;
+	while ((*p >= '0') && (*p <= '9')) {
+		ret = ret * 10 + (*p - '0');
+		p++;
+	}
+	*ptr = p;
+	return ret;
+}
+
+static void
+mountopts(struct nfs_args *args, char *p)
+{
+	args->version = NFS_ARGSVERSION;
+	args->rsize = BOOTP_BLOCKSIZE;
+	args->wsize = BOOTP_BLOCKSIZE;
+	args->flags = NFSMNT_RSIZE | NFSMNT_WSIZE | NFSMNT_RESVPORT;
+	args->sotype = SOCK_DGRAM;
+	if (p != NULL)
+		nfs_parse_options(p, args);
+}
+
+static int
+xdr_opaque_decode(struct mbuf **mptr, u_char *buf, int len)
+{
+	struct mbuf *m;
+	int alignedlen;
+
+	m = *mptr;
+	alignedlen = ( len + 3 ) & ~3;
+
+	if (m->m_len < alignedlen) {
+		m = m_pullup(m, alignedlen);
+		if (m == NULL) {
+			*mptr = NULL;
+			return EBADRPC;
+		}
+	}
+	bcopy(mtod(m, u_char *), buf, len);
+	m_adj(m, alignedlen);
+	*mptr = m;
+	return 0;
+}
+
+static int
+xdr_int_decode(struct mbuf **mptr, int *iptr)
+{
+	u_int32_t i;
+
+	if (xdr_opaque_decode(mptr, (u_char *) &i, sizeof(u_int32_t)) != 0)
+		return EBADRPC;
+	*iptr = fxdr_unsigned(u_int32_t, i);
+	return 0;
+}
+
+static void
+print_sin_addr(struct sockaddr_in *sin)
+{
+
+	print_in_addr(sin->sin_addr);
+}
+
+static void
+print_in_addr(struct in_addr addr)
+{
+	unsigned int ip;
+
+	ip = ntohl(addr.s_addr);
+	printf("%d.%d.%d.%d",
+	       ip >> 24, (ip >> 16) & 255, (ip >> 8) & 255, ip & 255);
+}
+
+static void
+bootpc_compose_query(struct bootpc_ifcontext *ifctx,
+    struct bootpc_globalcontext *gctx, struct thread *td)
+{
+	unsigned char *vendp;
+	unsigned char vendor_client[64];
+	uint32_t leasetime;
+	uint8_t vendor_client_len;
+
+	ifctx->gotrootpath = 0;
+
+	bzero((caddr_t) &ifctx->call, sizeof(ifctx->call));
+
+	/* bootpc part */
+	ifctx->call.op = BOOTP_REQUEST; 	/* BOOTREQUEST */
+	ifctx->call.htype = 1;			/* 10mb ethernet */
+	ifctx->call.hlen = ifctx->sdl->sdl_alen;/* Hardware address length */
+	ifctx->call.hops = 0;
+	if (bootpc_ifctx_isunresolved(ifctx) != 0)
+		ifctx->xid++;
+	ifctx->call.xid = txdr_unsigned(ifctx->xid);
+	bcopy(LLADDR(ifctx->sdl), &ifctx->call.chaddr, ifctx->sdl->sdl_alen);
+
+	vendp = ifctx->call.vend;
+	*vendp++ = 99;		/* RFC1048 cookie */
+	*vendp++ = 130;
+	*vendp++ = 83;
+	*vendp++ = 99;
+	*vendp++ = TAG_MAXMSGSIZE;
+	*vendp++ = 2;
+	*vendp++ = (sizeof(struct bootp_packet) >> 8) & 255;
+	*vendp++ = sizeof(struct bootp_packet) & 255;
+
+	snprintf(vendor_client, sizeof(vendor_client), "%s:%s:%s",
+		ostype, MACHINE, osrelease);
+	vendor_client_len = strlen(vendor_client);
+	*vendp++ = TAG_VENDOR_INDENTIFIER;
+	*vendp++ = vendor_client_len;
+	memcpy(vendp, vendor_client, vendor_client_len);
+	vendp += vendor_client_len;
+	ifctx->dhcpquerytype = DHCP_NOMSG;
+	switch (ifctx->state) {
+	case IF_DHCP_UNRESOLVED:
+		*vendp++ = TAG_DHCP_MSGTYPE;
+		*vendp++ = 1;
+		*vendp++ = DHCP_DISCOVER;
+		ifctx->dhcpquerytype = DHCP_DISCOVER;
+		ifctx->gotdhcpserver = 0;
+		break;
+	case IF_DHCP_OFFERED:
+		*vendp++ = TAG_DHCP_MSGTYPE;
+		*vendp++ = 1;
+		*vendp++ = DHCP_REQUEST;
+		ifctx->dhcpquerytype = DHCP_REQUEST;
+		*vendp++ = TAG_DHCP_REQ_ADDR;
+		*vendp++ = 4;
+		memcpy(vendp, &ifctx->reply.yiaddr, 4);
+		vendp += 4;
+		if (ifctx->gotdhcpserver != 0) {
+			*vendp++ = TAG_DHCP_SERVERID;
+			*vendp++ = 4;
+			memcpy(vendp, &ifctx->dhcpserver, 4);
+			vendp += 4;
+		}
+		*vendp++ = TAG_DHCP_LEASETIME;
+		*vendp++ = 4;
+		leasetime = htonl(300);
+		memcpy(vendp, &leasetime, 4);
+		vendp += 4;
+		break;
+	default:
+		break;
+	}
+	*vendp = TAG_END;
+
+	ifctx->call.secs = 0;
+	ifctx->call.flags = htons(0x8000); /* We need a broadcast answer */
+}
+
+static int
+bootpc_hascookie(struct bootp_packet *bp)
+{
+
+	return (bp->vend[0] == 99 && bp->vend[1] == 130 &&
+		bp->vend[2] == 83 && bp->vend[3] == 99);
+}
+
+static void
+bootpc_tag_helper(struct bootpc_tagcontext *tctx,
+    unsigned char *start, int len, int tag)
+{
+	unsigned char *j;
+	unsigned char *ej;
+	unsigned char code;
+
+	if (tctx->badtag != 0 || tctx->badopt != 0)
+		return;
+
+	j = start;
+	ej = j + len;
+
+	while (j < ej) {
+		code = *j++;
+		if (code == TAG_PAD)
+			continue;
+		if (code == TAG_END)
+			return;
+		if (j >= ej || j + *j + 1 > ej) {
+			tctx->badopt = 1;
+			return;
+		}
+		len = *j++;
+		if (code == tag) {
+			if (tctx->taglen + len > TAG_MAXLEN) {
+				tctx->badtag = 1;
+				return;
+			}
+			tctx->foundopt = 1;
+			if (len > 0)
+				memcpy(tctx->buf + tctx->taglen,
+				       j, len);
+			tctx->taglen += len;
+		}
+		if (code == TAG_OVERLOAD)
+			tctx->overload = *j;
+
+		j += len;
+	}
+}
+
+static unsigned char *
+bootpc_tag(struct bootpc_tagcontext *tctx,
+    struct bootp_packet *bp, int len, int tag)
+{
+	tctx->overload = 0;
+	tctx->badopt = 0;
+	tctx->badtag = 0;
+	tctx->foundopt = 0;
+	tctx->taglen = 0;
+
+	if (bootpc_hascookie(bp) == 0)
+		return NULL;
+
+	bootpc_tag_helper(tctx, &bp->vend[4],
+			  (unsigned char *) bp + len - &bp->vend[4], tag);
+
+	if ((tctx->overload & OVERLOAD_FILE) != 0)
+		bootpc_tag_helper(tctx,
+				  (unsigned char *) bp->file,
+				  sizeof(bp->file),
+				  tag);
+	if ((tctx->overload & OVERLOAD_SNAME) != 0)
+		bootpc_tag_helper(tctx,
+				  (unsigned char *) bp->sname,
+				  sizeof(bp->sname),
+				  tag);
+
+	if (tctx->badopt != 0 || tctx->badtag != 0 || tctx->foundopt == 0)
+		return NULL;
+	tctx->buf[tctx->taglen] = '\0';
+	return tctx->buf;
+}
+
+static void
+bootpc_decode_reply(struct nfsv3_diskless *nd, struct bootpc_ifcontext *ifctx,
+    struct bootpc_globalcontext *gctx)
+{
+	char *p;
+	unsigned int ip;
+
+	ifctx->gotgw = 0;
+	ifctx->gotnetmask = 0;
+
+	clear_sinaddr(&ifctx->myaddr);
+	clear_sinaddr(&ifctx->netmask);
+	clear_sinaddr(&ifctx->gw);
+
+	ifctx->myaddr.sin_addr = ifctx->reply.yiaddr;
+
+	ip = ntohl(ifctx->myaddr.sin_addr.s_addr);
+
+	printf("%s at ", ifctx->ireq.ifr_name);
+	print_sin_addr(&ifctx->myaddr);
+	printf(" server ");
+	print_in_addr(ifctx->reply.siaddr);
+
+	ifctx->gw.sin_addr = ifctx->reply.giaddr;
+	if (ifctx->reply.giaddr.s_addr != htonl(INADDR_ANY)) {
+		printf(" via gateway ");
+		print_in_addr(ifctx->reply.giaddr);
+	}
+
+	/* This call used for the side effect (overload flag) */
+	(void) bootpc_tag(&gctx->tmptag,
+			  &ifctx->reply, ifctx->replylen, TAG_END);
+
+	if ((gctx->tmptag.overload & OVERLOAD_SNAME) == 0)
+		if (ifctx->reply.sname[0] != '\0')
+			printf(" server name %s", ifctx->reply.sname);
+	if ((gctx->tmptag.overload & OVERLOAD_FILE) == 0)
+		if (ifctx->reply.file[0] != '\0')
+			printf(" boot file %s", ifctx->reply.file);
+
+	printf("\n");
+
+	p = bootpc_tag(&gctx->tag, &ifctx->reply, ifctx->replylen,
+		       TAG_SUBNETMASK);
+	if (p != NULL) {
+		if (gctx->tag.taglen != 4)
+			panic("bootpc: subnet mask len is %d",
+			      gctx->tag.taglen);
+		bcopy(p, &ifctx->netmask.sin_addr, 4);
+		ifctx->gotnetmask = 1;
+		printf("subnet mask ");
+		print_sin_addr(&ifctx->netmask);
+		printf(" ");
+	}
+
+	p = bootpc_tag(&gctx->tag, &ifctx->reply, ifctx->replylen,
+		       TAG_ROUTERS);
+	if (p != NULL) {
+		/* Routers */
+		if (gctx->tag.taglen % 4)
+			panic("bootpc: Router Len is %d", gctx->tag.taglen);
+		if (gctx->tag.taglen > 0) {
+			bcopy(p, &ifctx->gw.sin_addr, 4);
+			printf("router ");
+			print_sin_addr(&ifctx->gw);
+			printf(" ");
+			ifctx->gotgw = 1;
+			gctx->gotgw = 1;
+		}
+	}
+
+	p = bootpc_tag(&gctx->tag, &ifctx->reply, ifctx->replylen,
+		       TAG_ROOT);
+	if (p != NULL) {
+		if (gctx->setrootfs != NULL) {
+			printf("rootfs %s (ignored) ", p);
+		} else 	if (setfs(&nd->root_saddr,
+				  nd->root_hostnam, p, &ifctx->reply.siaddr)) {
+			if (*p == '/') {
+				printf("root_server ");
+				print_sin_addr(&nd->root_saddr);
+				printf(" ");
+			}
+			printf("rootfs %s ", p);
+			gctx->gotrootpath = 1;
+			ifctx->gotrootpath = 1;
+			gctx->setrootfs = ifctx;
+
+			p = bootpc_tag(&gctx->tag, &ifctx->reply,
+				       ifctx->replylen,
+				       TAG_ROOTOPTS);
+			if (p != NULL) {
+				mountopts(&nd->root_args, p);
+				printf("rootopts %s ", p);
+			}
+		} else
+			panic("Failed to set rootfs to %s", p);
+	}
+
+	p = bootpc_tag(&gctx->tag, &ifctx->reply, ifctx->replylen,
+		       TAG_HOSTNAME);
+	if (p != NULL) {
+		if (gctx->tag.taglen >= MAXHOSTNAMELEN)
+			panic("bootpc: hostname >= %d bytes",
+			      MAXHOSTNAMELEN);
+		if (gctx->sethostname != NULL) {
+			printf("hostname %s (ignored) ", p);
+		} else {
+			strcpy(nd->my_hostnam, p);
+			mtx_lock(&prison0.pr_mtx);
+			strcpy(prison0.pr_hostname, p);
+			mtx_unlock(&prison0.pr_mtx);
+			printf("hostname %s ", p);
+			gctx->sethostname = ifctx;
+		}
+	}
+	p = bootpc_tag(&gctx->tag, &ifctx->reply, ifctx->replylen,
+			TAG_COOKIE);
+	if (p != NULL) {        /* store in a sysctl variable */
+		int i, l = sizeof(bootp_cookie) - 1;
+		for (i = 0; i < l && p[i] != '\0'; i++)
+			bootp_cookie[i] = p[i];
+		p[i] = '\0';
+	}
+
+
+	printf("\n");
+
+	if (ifctx->gotnetmask == 0) {
+		if (IN_CLASSA(ntohl(ifctx->myaddr.sin_addr.s_addr)))
+			ifctx->netmask.sin_addr.s_addr = htonl(IN_CLASSA_NET);
+		else if (IN_CLASSB(ntohl(ifctx->myaddr.sin_addr.s_addr)))
+			ifctx->netmask.sin_addr.s_addr = htonl(IN_CLASSB_NET);
+		else
+			ifctx->netmask.sin_addr.s_addr = htonl(IN_CLASSC_NET);
+	}
+	if (ifctx->gotgw == 0) {
+		/* Use proxyarp */
+		ifctx->gw.sin_addr.s_addr = ifctx->myaddr.sin_addr.s_addr;
+	}
+}
+
+void
+bootpc_init(void)
+{
+	struct bootpc_ifcontext *ifctx, *nctx;	/* Interface BOOTP contexts */
+	struct bootpc_globalcontext *gctx; 	/* Global BOOTP context */
+	struct ifnet *ifp;
+	int error;
+#ifndef BOOTP_WIRED_TO
+	int ifcnt;
+#endif
+	struct nfsv3_diskless *nd;
+	struct thread *td;
+
+	nd = &nfsv3_diskless;
+	td = curthread;
+
+	/*
+	 * If already filled in, don't touch it here
+	 */
+	if (nfs_diskless_valid != 0)
+		return;
+
+	gctx = malloc(sizeof(*gctx), M_TEMP, M_WAITOK | M_ZERO);
+	if (gctx == NULL)
+		panic("Failed to allocate bootp global context structure");
+
+	gctx->xid = ~0xFFFF;
+	gctx->starttime = time_second;
+
+	/*
+	 * Find a network interface.
+	 */
+	CURVNET_SET(TD_TO_VNET(td));
+#ifdef BOOTP_WIRED_TO
+	printf("bootpc_init: wired to interface '%s'\n",
+	       __XSTRING(BOOTP_WIRED_TO));
+	allocifctx(gctx);
+#else
+	/*
+	 * Preallocate interface context storage, if another interface
+	 * attaches and wins the race, it won't be eligible for bootp.
+	 */
+	IFNET_RLOCK();
+	for (ifp = TAILQ_FIRST(&V_ifnet), ifcnt = 0;
+	     ifp != NULL;
+	     ifp = TAILQ_NEXT(ifp, if_link)) {
+		if ((ifp->if_flags &
+		     (IFF_LOOPBACK | IFF_POINTOPOINT | IFF_BROADCAST)) !=
+		    IFF_BROADCAST)
+			continue;
+		ifcnt++;
+	}
+	IFNET_RUNLOCK();
+	if (ifcnt == 0)
+		panic("bootpc_init: no eligible interfaces");
+	for (; ifcnt > 0; ifcnt--)
+		allocifctx(gctx);
+#endif
+
+	IFNET_RLOCK();
+	for (ifp = TAILQ_FIRST(&V_ifnet), ifctx = gctx->interfaces;
+	     ifp != NULL && ifctx != NULL;
+	     ifp = TAILQ_NEXT(ifp, if_link)) {
+		strlcpy(ifctx->ireq.ifr_name, ifp->if_xname,
+		    sizeof(ifctx->ireq.ifr_name));
+#ifdef BOOTP_WIRED_TO
+		if (strcmp(ifctx->ireq.ifr_name,
+			   __XSTRING(BOOTP_WIRED_TO)) != 0)
+			continue;
+#else
+		if ((ifp->if_flags &
+		     (IFF_LOOPBACK | IFF_POINTOPOINT | IFF_BROADCAST)) !=
+		    IFF_BROADCAST)
+			continue;
+#endif
+		ifctx->ifp = ifp;
+		ifctx = ifctx->next;
+	}
+	IFNET_RUNLOCK();
+	CURVNET_RESTORE();
+
+	if (gctx->interfaces == NULL || gctx->interfaces->ifp == NULL) {
+#ifdef BOOTP_WIRED_TO
+		panic("bootpc_init: Could not find interface specified "
+		      "by BOOTP_WIRED_TO: "
+		      __XSTRING(BOOTP_WIRED_TO));
+#else
+		panic("bootpc_init: no suitable interface");
+#endif
+	}
+
+	for (ifctx = gctx->interfaces; ifctx != NULL; ifctx = ifctx->next)
+		bootpc_fakeup_interface(ifctx, gctx, td);
+
+	for (ifctx = gctx->interfaces; ifctx != NULL; ifctx = ifctx->next)
+		bootpc_compose_query(ifctx, gctx, td);
+
+	error = bootpc_call(gctx, td);
+
+	if (error != 0) {
+#ifdef BOOTP_NFSROOT
+		panic("BOOTP call failed");
+#else
+		printf("BOOTP call failed\n");
+#endif
+	}
+
+	rootdevnames[0] = "nfs:";
+	mountopts(&nd->root_args, NULL);
+
+	for (ifctx = gctx->interfaces; ifctx != NULL; ifctx = ifctx->next)
+		if (bootpc_ifctx_isresolved(ifctx) != 0)
+			bootpc_decode_reply(nd, ifctx, gctx);
+
+#ifdef BOOTP_NFSROOT
+	if (gctx->gotrootpath == 0)
+		panic("bootpc: No root path offered");
+#endif
+
+	for (ifctx = gctx->interfaces; ifctx != NULL; ifctx = ifctx->next) {
+		bootpc_adjust_interface(ifctx, gctx, td);
+
+		soclose(ifctx->so);
+	}
+
+	for (ifctx = gctx->interfaces; ifctx != NULL; ifctx = ifctx->next)
+		if (ifctx->gotrootpath != 0)
+			break;
+	if (ifctx == NULL) {
+		for (ifctx = gctx->interfaces;
+		     ifctx != NULL;
+		     ifctx = ifctx->next)
+			if (bootpc_ifctx_isresolved(ifctx) != 0)
+				break;
+	}
+	if (ifctx == NULL)
+		goto out;
+
+	if (gctx->gotrootpath != 0) {
+
+		setenv("boot.netif.name", ifctx->ifp->if_xname);
+
+		error = md_mount(&nd->root_saddr, nd->root_hostnam,
+				 nd->root_fh, &nd->root_fhsize,
+				 &nd->root_args, td);
+		if (error != 0)
+			panic("nfs_boot: mountd root, error=%d", error);
+
+		nfs_diskless_valid = 3;
+	}
+
+	strcpy(nd->myif.ifra_name, ifctx->ireq.ifr_name);
+	bcopy(&ifctx->myaddr, &nd->myif.ifra_addr, sizeof(ifctx->myaddr));
+	bcopy(&ifctx->myaddr, &nd->myif.ifra_broadaddr, sizeof(ifctx->myaddr));
+	((struct sockaddr_in *) &nd->myif.ifra_broadaddr)->sin_addr.s_addr =
+		ifctx->myaddr.sin_addr.s_addr |
+		~ ifctx->netmask.sin_addr.s_addr;
+	bcopy(&ifctx->netmask, &nd->myif.ifra_mask, sizeof(ifctx->netmask));
+
+out:
+	for (ifctx = gctx->interfaces; ifctx != NULL; ifctx = nctx) {
+		nctx = ifctx->next;
+		free(ifctx, M_TEMP);
+	}
+	free(gctx, M_TEMP);
+}
+
+/*
+ * RPC: mountd/mount
+ * Given a server pathname, get an NFS file handle.
+ * Also, sets sin->sin_port to the NFS service port.
+ */
+static int
+md_mount(struct sockaddr_in *mdsin, char *path, u_char *fhp, int *fhsizep,
+    struct nfs_args *args, struct thread *td)
+{
+	struct mbuf *m;
+	int error;
+	int authunixok;
+	int authcount;
+	int authver;
+
+#define	RPCPROG_MNT	100005
+#define	RPCMNT_VER1	1
+#define RPCMNT_VER3	3
+#define	RPCMNT_MOUNT	1
+#define	AUTH_SYS	1		/* unix style (uid, gids) */
+#define AUTH_UNIX	AUTH_SYS
+
+	/* XXX honor v2/v3 flags in args->flags? */
+#ifdef BOOTP_NFSV3
+	/* First try NFS v3 */
+	/* Get port number for MOUNTD. */
+	error = krpc_portmap(mdsin, RPCPROG_MNT, RPCMNT_VER3,
+			     &mdsin->sin_port, td);
+	if (error == 0) {
+		m = xdr_string_encode(path, strlen(path));
+
+		/* Do RPC to mountd. */
+		error = krpc_call(mdsin, RPCPROG_MNT, RPCMNT_VER3,
+				  RPCMNT_MOUNT, &m, NULL, td);
+	}
+	if (error == 0) {
+		args->flags |= NFSMNT_NFSV3;
+	} else {
+#endif
+		/* Fallback to NFS v2 */
+
+		/* Get port number for MOUNTD. */
+		error = krpc_portmap(mdsin, RPCPROG_MNT, RPCMNT_VER1,
+				     &mdsin->sin_port, td);
+		if (error != 0)
+			return error;
+
+		m = xdr_string_encode(path, strlen(path));
+
+		/* Do RPC to mountd. */
+		error = krpc_call(mdsin, RPCPROG_MNT, RPCMNT_VER1,
+				  RPCMNT_MOUNT, &m, NULL, td);
+		if (error != 0)
+			return error;	/* message already freed */
+
+#ifdef BOOTP_NFSV3
+	}
+#endif
+
+	if (xdr_int_decode(&m, &error) != 0 || error != 0)
+		goto bad;
+
+	if ((args->flags & NFSMNT_NFSV3) != 0) {
+		if (xdr_int_decode(&m, fhsizep) != 0 ||
+		    *fhsizep > NFSX_V3FHMAX ||
+		    *fhsizep <= 0)
+			goto bad;
+	} else
+		*fhsizep = NFSX_V2FH;
+
+	if (xdr_opaque_decode(&m, fhp, *fhsizep) != 0)
+		goto bad;
+
+	if (args->flags & NFSMNT_NFSV3) {
+		if (xdr_int_decode(&m, &authcount) != 0)
+			goto bad;
+		authunixok = 0;
+		if (authcount < 0 || authcount > 100)
+			goto bad;
+		while (authcount > 0) {
+			if (xdr_int_decode(&m, &authver) != 0)
+				goto bad;
+			if (authver == AUTH_UNIX)
+				authunixok = 1;
+			authcount--;
+		}
+		if (authunixok == 0)
+			goto bad;
+	}
+
+	/* Set port number for NFS use. */
+	error = krpc_portmap(mdsin, NFS_PROG,
+			     (args->flags &
+			      NFSMNT_NFSV3) ? NFS_VER3 : NFS_VER2,
+			     &mdsin->sin_port, td);
+
+	goto out;
+
+bad:
+	error = EBADRPC;
+
+out:
+	m_freem(m);
+	return error;
+}
+
+SYSINIT(bootp_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, bootpc_init, NULL);
diff --git a/sys/nfs/krpc.h b/sys/nfs/krpc.h
new file mode 100644
index 0000000..44b84e0
--- /dev/null
+++ b/sys/nfs/krpc.h
@@ -0,0 +1,31 @@
+/*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
+/* $FreeBSD$	*/
+
+#include <sys/cdefs.h>
+
+struct mbuf;
+struct thread;
+struct sockaddr;
+struct sockaddr_in;
+
+int krpc_call(struct sockaddr_in *_sin,
+	u_int prog, u_int vers, u_int func,
+	struct mbuf **data, struct sockaddr **from, struct thread *td);
+
+int krpc_portmap(struct sockaddr_in *_sin,
+	u_int prog, u_int vers, u_int16_t *portp, struct thread *td);
+
+struct mbuf *xdr_string_encode(char *str, int len);
+
+/*
+ * RPC definitions for the portmapper
+ */
+#define	PMAPPORT		111
+#define	PMAPPROG		100000
+#define	PMAPVERS		2
+#define	PMAPPROC_NULL		0
+#define	PMAPPROC_SET		1
+#define	PMAPPROC_UNSET		2
+#define	PMAPPROC_GETPORT	3
+#define	PMAPPROC_DUMP		4
+#define	PMAPPROC_CALLIT		5
diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c
new file mode 100644
index 0000000..18e0f9b
--- /dev/null
+++ b/sys/nfs/krpc_subr.c
@@ -0,0 +1,470 @@
+/*	$NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $	*/
+
+/*-
+ * Copyright (c) 1995 Gordon Ross, Adam Glass
+ * Copyright (c) 1992 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This software was developed by the Computer Systems Engineering group
+ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ * contributed to Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Lawrence Berkeley Laboratory and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * partially based on:
+ *      libnetboot/rpc.c
+ *               @(#) Header: rpc.c,v 1.12 93/09/28 08:31:56 leres Exp  (LBL)
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/jail.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/uio.h>
+
+#include <net/if.h>
+#include <net/vnet.h>
+
+#include <netinet/in.h>
+
+#include <rpc/types.h>
+#include <rpc/auth.h>
+#include <rpc/rpc_msg.h>
+#include <nfs/krpc.h>
+#include <nfs/xdr_subs.h>
+
+/*
+ * Kernel support for Sun RPC
+ *
+ * Used currently for bootstrapping in nfs diskless configurations.
+ */
+
+/*
+ * Generic RPC headers
+ */
+
+struct auth_info {
+	u_int32_t 	authtype;	/* auth type */
+	u_int32_t	authlen;	/* auth length */
+};
+
+struct auth_unix {
+	int32_t   ua_time;
+	int32_t   ua_hostname;	/* null */
+	int32_t   ua_uid;
+	int32_t   ua_gid;
+	int32_t   ua_gidlist;	/* null */
+};
+
+struct krpc_call {
+	u_int32_t	rp_xid;		/* request transaction id */
+	int32_t 	rp_direction;	/* call direction (0) */
+	u_int32_t	rp_rpcvers;	/* rpc version (2) */
+	u_int32_t	rp_prog;	/* program */
+	u_int32_t	rp_vers;	/* version */
+	u_int32_t	rp_proc;	/* procedure */
+	struct	auth_info rpc_auth;
+	struct	auth_unix rpc_unix;
+	struct	auth_info rpc_verf;
+};
+
+struct krpc_reply {
+	u_int32_t rp_xid;		/* request transaction id */
+	int32_t  rp_direction;		/* call direction (1) */
+	int32_t  rp_astatus;		/* accept status (0: accepted) */
+	union {
+		u_int32_t rpu_errno;
+		struct {
+			struct auth_info rok_auth;
+			u_int32_t	rok_status;
+		} rpu_rok;
+	} rp_u;
+};
+#define rp_errno  rp_u.rpu_errno
+#define rp_auth   rp_u.rpu_rok.rok_auth
+#define rp_status rp_u.rpu_rok.rok_status
+
+#define MIN_REPLY_HDR 16	/* xid, dir, astat, errno */
+
+/*
+ * What is the longest we will wait before re-sending a request?
+ * Note this is also the frequency of "RPC timeout" messages.
+ * The re-send loop count sup linearly to this maximum, so the
+ * first complaint will happen after (1+2+3+4+5)=15 seconds.
+ */
+#define	MAX_RESEND_DELAY 5	/* seconds */
+
+/*
+ * Call portmap to lookup a port number for a particular rpc program
+ * Returns non-zero error on failure.
+ */
+int
+krpc_portmap(struct sockaddr_in *sin, u_int prog, u_int vers, u_int16_t *portp,
+    struct thread *td)
+{
+	struct sdata {
+		u_int32_t prog;		/* call program */
+		u_int32_t vers;		/* call version */
+		u_int32_t proto;	/* call protocol */
+		u_int32_t port;		/* call port (unused) */
+	} *sdata;
+	struct rdata {
+		u_int16_t pad;
+		u_int16_t port;
+	} *rdata;
+	struct mbuf *m;
+	int error;
+
+	/* The portmapper port is fixed. */
+	if (prog == PMAPPROG) {
+		*portp = htons(PMAPPORT);
+		return 0;
+	}
+
+	m = m_get(M_WAIT, MT_DATA);
+	sdata = mtod(m, struct sdata *);
+	m->m_len = sizeof(*sdata);
+
+	/* Do the RPC to get it. */
+	sdata->prog = txdr_unsigned(prog);
+	sdata->vers = txdr_unsigned(vers);
+	sdata->proto = txdr_unsigned(IPPROTO_UDP);
+	sdata->port = 0;
+
+	sin->sin_port = htons(PMAPPORT);
+	error = krpc_call(sin, PMAPPROG, PMAPVERS,
+					  PMAPPROC_GETPORT, &m, NULL, td);
+	if (error)
+		return error;
+
+	if (m->m_len < sizeof(*rdata)) {
+		m = m_pullup(m, sizeof(*rdata));
+		if (m == NULL)
+			return ENOBUFS;
+	}
+	rdata = mtod(m, struct rdata *);
+	*portp = rdata->port;
+
+	m_freem(m);
+	return 0;
+}
+
+/*
+ * Do a remote procedure call (RPC) and wait for its reply.
+ * If from_p is non-null, then we are doing broadcast, and
+ * the address from whence the response came is saved there.
+ */
+int
+krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
+    struct mbuf **data, struct sockaddr **from_p, struct thread *td)
+{
+	struct socket *so;
+	struct sockaddr_in *sin, ssin;
+	struct sockaddr *from;
+	struct mbuf *m, *nam, *mhead;
+	struct krpc_call *call;
+	struct krpc_reply *reply;
+	struct sockopt sopt;
+	struct timeval tv;
+	struct uio auio;
+	int error, rcvflg, timo, secs, len;
+	static u_int32_t xid = ~0xFF;
+	u_int16_t tport;
+	u_int32_t saddr;
+
+	/*
+	 * Validate address family.
+	 * Sorry, this is INET specific...
+	 */
+	if (sa->sin_family != AF_INET)
+		return (EAFNOSUPPORT);
+
+	/* Free at end if not null. */
+	nam = mhead = NULL;
+	from = NULL;
+
+	/*
+	 * Create socket and set its recieve timeout.
+	 */
+	if ((error = socreate(AF_INET, &so, SOCK_DGRAM, 0, td->td_ucred, td)))
+		goto out;
+
+	tv.tv_sec = 1;
+	tv.tv_usec = 0;
+	bzero(&sopt, sizeof sopt);
+	sopt.sopt_dir = SOPT_SET;
+	sopt.sopt_level = SOL_SOCKET;
+	sopt.sopt_name = SO_RCVTIMEO;
+	sopt.sopt_val = &tv;
+	sopt.sopt_valsize = sizeof tv;
+
+	if ((error = sosetopt(so, &sopt)) != 0)
+		goto out;
+
+	/*
+	 * Enable broadcast if necessary.
+	 */
+	if (from_p) {
+		int on = 1;
+		sopt.sopt_name = SO_BROADCAST;
+		sopt.sopt_val = &on;
+		sopt.sopt_valsize = sizeof on;
+		if ((error = sosetopt(so, &sopt)) != 0)
+			goto out;
+	}
+
+	/*
+	 * Bind the local endpoint to a reserved port,
+	 * because some NFS servers refuse requests from
+	 * non-reserved (non-privileged) ports.
+	 */
+	sin = &ssin;
+	bzero(sin, sizeof *sin);
+	sin->sin_len = sizeof(*sin);
+	sin->sin_family = AF_INET;
+	sin->sin_addr.s_addr = INADDR_ANY;
+	tport = IPPORT_RESERVED;
+	do {
+		tport--;
+		sin->sin_port = htons(tport);
+		error = sobind(so, (struct sockaddr *)sin, td);
+	} while (error == EADDRINUSE &&
+			 tport > IPPORT_RESERVED / 2);
+	if (error) {
+		printf("bind failed\n");
+		goto out;
+	}
+
+	/*
+	 * Setup socket address for the server.
+	 */
+
+	/*
+	 * Prepend RPC message header.
+	 */
+	mhead = m_gethdr(M_WAIT, MT_DATA);
+	mhead->m_next = *data;
+	call = mtod(mhead, struct krpc_call *);
+	mhead->m_len = sizeof(*call);
+	bzero((caddr_t)call, sizeof(*call));
+	/* rpc_call part */
+	xid++;
+	call->rp_xid = txdr_unsigned(xid);
+	/* call->rp_direction = 0; */
+	call->rp_rpcvers = txdr_unsigned(2);
+	call->rp_prog = txdr_unsigned(prog);
+	call->rp_vers = txdr_unsigned(vers);
+	call->rp_proc = txdr_unsigned(func);
+	/* rpc_auth part (auth_unix as root) */
+	call->rpc_auth.authtype = txdr_unsigned(AUTH_UNIX);
+	call->rpc_auth.authlen  = txdr_unsigned(sizeof(struct auth_unix));
+	/* rpc_verf part (auth_null) */
+	call->rpc_verf.authtype = 0;
+	call->rpc_verf.authlen  = 0;
+
+	/*
+	 * Setup packet header
+	 */
+	m_fixhdr(mhead);
+	mhead->m_pkthdr.rcvif = NULL;
+
+	/*
+	 * Send it, repeatedly, until a reply is received,
+	 * but delay each re-send by an increasing amount.
+	 * If the delay hits the maximum, start complaining.
+	 */
+	timo = 0;
+	for (;;) {
+		/* Send RPC request (or re-send). */
+		m = m_copym(mhead, 0, M_COPYALL, M_WAIT);
+		error = sosend(so, (struct sockaddr *)sa, NULL, m,
+			       NULL, 0, td);
+		if (error) {
+			printf("krpc_call: sosend: %d\n", error);
+			goto out;
+		}
+		m = NULL;
+
+		/* Determine new timeout. */
+		if (timo < MAX_RESEND_DELAY)
+			timo++;
+		else {
+			saddr = ntohl(sa->sin_addr.s_addr);
+			printf("RPC timeout for server %d.%d.%d.%d\n",
+			       (saddr >> 24) & 255,
+			       (saddr >> 16) & 255,
+			       (saddr >> 8) & 255,
+			       saddr & 255);
+		}
+
+		/*
+		 * Wait for up to timo seconds for a reply.
+		 * The socket receive timeout was set to 1 second.
+		 */
+		secs = timo;
+		while (secs > 0) {
+			if (from) {
+				free(from, M_SONAME);
+				from = NULL;
+			}
+			if (m) {
+				m_freem(m);
+				m = NULL;
+			}
+			bzero(&auio, sizeof(auio));
+			auio.uio_resid = len = 1<<16;
+			rcvflg = 0;
+			error = soreceive(so, &from, &auio, &m, NULL, &rcvflg);
+			if (error == EWOULDBLOCK) {
+				secs--;
+				continue;
+			}
+			if (error)
+				goto out;
+			len -= auio.uio_resid;
+
+			/* Does the reply contain at least a header? */
+			if (len < MIN_REPLY_HDR)
+				continue;
+			if (m->m_len < MIN_REPLY_HDR)
+				continue;
+			reply = mtod(m, struct krpc_reply *);
+
+			/* Is it the right reply? */
+			if (reply->rp_direction != txdr_unsigned(REPLY))
+				continue;
+
+			if (reply->rp_xid != txdr_unsigned(xid))
+				continue;
+
+			/* Was RPC accepted? (authorization OK) */
+			if (reply->rp_astatus != 0) {
+				error = fxdr_unsigned(u_int32_t, reply->rp_errno);
+				printf("rpc denied, error=%d\n", error);
+				continue;
+			}
+
+			/* Did the call succeed? */
+			if (reply->rp_status != 0) {
+				error = fxdr_unsigned(u_int32_t, reply->rp_status);
+				if (error == PROG_MISMATCH) {
+				  error = EBADRPC;
+				  goto out;
+				}
+				printf("rpc denied, status=%d\n", error);
+				continue;
+			}
+
+			goto gotreply;	/* break two levels */
+
+		} /* while secs */
+	} /* forever send/receive */
+
+	error = ETIMEDOUT;
+	goto out;
+
+ gotreply:
+
+	/*
+	 * Get RPC reply header into first mbuf,
+	 * get its length, then strip it off.
+	 */
+	len = sizeof(*reply);
+	if (m->m_len < len) {
+		m = m_pullup(m, len);
+		if (m == NULL) {
+			error = ENOBUFS;
+			goto out;
+		}
+	}
+	reply = mtod(m, struct krpc_reply *);
+	if (reply->rp_auth.authtype != 0) {
+		len += fxdr_unsigned(u_int32_t, reply->rp_auth.authlen);
+		len = (len + 3) & ~3; /* XXX? */
+	}
+	m_adj(m, len);
+
+	/* result */
+	*data = m;
+	if (from_p) {
+		*from_p = from;
+		from = NULL;
+	}
+
+ out:
+	if (mhead) m_freem(mhead);
+	if (from) free(from, M_SONAME);
+	soclose(so);
+	return error;
+}
+
+/*
+ * eXternal Data Representation routines.
+ * (but with non-standard args...)
+ */
+
+/*
+ * String representation for RPC.
+ */
+struct xdr_string {
+	u_int32_t len;		/* length without null or padding */
+	char data[4];	/* data (longer, of course) */
+    /* data is padded to a long-word boundary */
+};
+
+struct mbuf *
+xdr_string_encode(char *str, int len)
+{
+	struct mbuf *m;
+	struct xdr_string *xs;
+	int dlen;	/* padded string length */
+	int mlen;	/* message length */
+
+	dlen = (len + 3) & ~3;
+	mlen = dlen + 4;
+
+	if (mlen > MCLBYTES)		/* If too big, we just can't do it. */
+		return (NULL);
+
+	m = m_get(M_WAIT, MT_DATA);
+	if (mlen > MLEN)
+		MCLGET(m, M_WAIT);
+	xs = mtod(m, struct xdr_string *);
+	m->m_len = mlen;
+	xs->len = txdr_unsigned(len);
+	bcopy(str, xs->data, len);
+	return (m);
+}
diff --git a/sys/nfs/nfs_diskless.c b/sys/nfs/nfs_diskless.c
new file mode 100644
index 0000000..fad6ef0
--- /dev/null
+++ b/sys/nfs/nfs_diskless.c
@@ -0,0 +1,425 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * William Jolitz.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_bootp.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/jail.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_types.h>
+#include <net/if_var.h>
+#include <net/ethernet.h>
+#include <net/vnet.h>
+
+#include <netinet/in.h>
+#include <nfs/nfsproto.h>
+#include <nfsclient/nfs.h>
+#include <nfs/nfsdiskless.h>
+
+static int inaddr_to_sockaddr(char *ev, struct sockaddr_in *sa);
+static int hwaddr_to_sockaddr(char *ev, struct sockaddr_dl *sa);
+static int decode_nfshandle(char *ev, u_char *fh, int maxfh);
+
+/*
+ * This structure must be filled in by a primary bootstrap or bootstrap
+ * server for a diskless/dataless machine. It is initialized below just
+ * to ensure that it is allocated to initialized data (.data not .bss).
+ */
+struct nfs_diskless	nfs_diskless = { { { 0 } } };
+struct nfsv3_diskless	nfsv3_diskless = { { { 0 } } };
+int			nfs_diskless_valid = 0;
+
+/*
+ * Validate/sanity check a rsize/wsize parameter.
+ */
+static int
+checkrwsize(unsigned long v, const char *name)
+{
+	/*
+	 * 32K is used as an upper bound because most servers
+	 * limit block size to satisfy IPv4's limit of
+	 * 64K/reassembled packet.  The lower bound is pretty
+	 * much arbitrary.
+	 */
+	if (!(4 <= v && v <= 32*1024)) {
+		printf("nfs_parse_options: invalid %s %lu ignored\n", name, v);
+		return 0;
+	} else
+		return 1;
+}
+
+/*
+ * Parse mount options and apply them to the supplied
+ * nfs_diskless state.  Used also by bootp/dhcp support.
+ */
+void
+nfs_parse_options(const char *envopts, struct nfs_args *nd)
+{
+	char *opts, *o, *otmp;
+	unsigned long v;
+
+	opts = strdup(envopts, M_TEMP);
+	otmp = opts;
+	while ((o = strsep(&otmp, ":;, ")) != NULL) {
+		if (*o == '\0')
+			; /* Skip empty options. */
+		else if (strcmp(o, "soft") == 0)
+			nd->flags |= NFSMNT_SOFT;
+		else if (strcmp(o, "intr") == 0)
+			nd->flags |= NFSMNT_INT;
+		else if (strcmp(o, "conn") == 0)
+			nd->flags |= NFSMNT_NOCONN;
+		else if (strcmp(o, "nolockd") == 0)
+			nd->flags |= NFSMNT_NOLOCKD;
+		else if (strcmp(o, "nfsv2") == 0)
+			nd->flags &= ~(NFSMNT_NFSV3 | NFSMNT_NFSV4);
+		else if (strcmp(o, "nfsv3") == 0) {
+			nd->flags &= ~NFSMNT_NFSV4;
+			nd->flags |= NFSMNT_NFSV3;
+		} else if (strcmp(o, "tcp") == 0)
+			nd->sotype = SOCK_STREAM;
+		else if (strcmp(o, "udp") == 0)
+			nd->sotype = SOCK_DGRAM;
+		else if (strncmp(o, "rsize=", 6) == 0) {
+			v = strtoul(o+6, NULL, 10);
+			if (checkrwsize(v, "rsize")) {
+				nd->rsize = (int) v;
+				nd->flags |= NFSMNT_RSIZE;
+			}
+		} else if (strncmp(o, "wsize=", 6) == 0) {
+			v = strtoul(o+6, NULL, 10);
+			if (checkrwsize(v, "wsize")) {
+				nd->wsize = (int) v;
+				nd->flags |= NFSMNT_WSIZE;
+			}
+		} else
+			printf("%s: skipping unknown option \"%s\"\n",
+			    __func__, o);
+	}
+	free(opts, M_TEMP);
+}
+
+/*
+ * Populate the essential fields in the nfsv3_diskless structure.
+ *
+ * The loader is expected to export the following environment variables:
+ *
+ * boot.netif.name		name of boot interface
+ * boot.netif.ip		IP address on boot interface
+ * boot.netif.netmask		netmask on boot interface
+ * boot.netif.gateway		default gateway (optional)
+ * boot.netif.hwaddr		hardware address of boot interface
+ * boot.nfsroot.server		IP address of root filesystem server
+ * boot.nfsroot.path		path of the root filesystem on server
+ * boot.nfsroot.nfshandle	NFS handle for root filesystem on server
+ * boot.nfsroot.nfshandlelen	and length of this handle (for NFSv3 only)
+ * boot.nfsroot.options		NFS options for the root filesystem
+ */
+void
+nfs_setup_diskless(void)
+{
+	struct nfs_diskless *nd = &nfs_diskless;
+	struct nfsv3_diskless *nd3 = &nfsv3_diskless;
+	struct ifnet *ifp;
+	struct ifaddr *ifa;
+	struct sockaddr_dl *sdl, ourdl;
+	struct sockaddr_in myaddr, netmask;
+	char *cp;
+	int cnt, fhlen, is_nfsv3;
+	uint32_t len;
+
+	if (nfs_diskless_valid != 0)
+		return;
+
+	/* get handle size. If this succeeds, it's an NFSv3 setup. */
+	if ((cp = getenv("boot.nfsroot.nfshandlelen")) != NULL) {
+		cnt = sscanf(cp, "%d", &len);
+		freeenv(cp);
+		if (cnt != 1 || len == 0 || len > NFSX_V3FHMAX) {
+			printf("nfs_diskless: bad NFS handle len\n");
+			return;
+		}
+		nd3->root_fhsize = len;
+		is_nfsv3 = 1;
+	} else
+		is_nfsv3 = 0;
+	/* set up interface */
+	if (inaddr_to_sockaddr("boot.netif.ip", &myaddr))
+		return;
+	if (inaddr_to_sockaddr("boot.netif.netmask", &netmask)) {
+		printf("nfs_diskless: no netmask\n");
+		return;
+	}
+	if (is_nfsv3 != 0) {
+		bcopy(&myaddr, &nd3->myif.ifra_addr, sizeof(myaddr));
+		bcopy(&myaddr, &nd3->myif.ifra_broadaddr, sizeof(myaddr));
+		((struct sockaddr_in *) 
+		   &nd3->myif.ifra_broadaddr)->sin_addr.s_addr =
+		    myaddr.sin_addr.s_addr | ~ netmask.sin_addr.s_addr;
+		bcopy(&netmask, &nd3->myif.ifra_mask, sizeof(netmask));
+	} else {
+		bcopy(&myaddr, &nd->myif.ifra_addr, sizeof(myaddr));
+		bcopy(&myaddr, &nd->myif.ifra_broadaddr, sizeof(myaddr));
+		((struct sockaddr_in *) 
+		   &nd->myif.ifra_broadaddr)->sin_addr.s_addr =
+		    myaddr.sin_addr.s_addr | ~ netmask.sin_addr.s_addr;
+		bcopy(&netmask, &nd->myif.ifra_mask, sizeof(netmask));
+	}
+
+	if (hwaddr_to_sockaddr("boot.netif.hwaddr", &ourdl)) {
+		printf("nfs_diskless: no hardware address\n");
+		return;
+	}
+	ifa = NULL;
+	CURVNET_SET(TD_TO_VNET(curthread));
+	IFNET_RLOCK();
+	TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
+		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
+			if (ifa->ifa_addr->sa_family == AF_LINK) {
+				sdl = (struct sockaddr_dl *)ifa->ifa_addr;
+				if ((sdl->sdl_type == ourdl.sdl_type) &&
+				    (sdl->sdl_alen == ourdl.sdl_alen) &&
+				    !bcmp(LLADDR(sdl),
+					  LLADDR(&ourdl),
+					  sdl->sdl_alen)) {
+				    IFNET_RUNLOCK();
+				    CURVNET_RESTORE();
+				    goto match_done;
+				}
+			}
+		}
+	}
+	IFNET_RUNLOCK();
+	CURVNET_RESTORE();
+	printf("nfs_diskless: no interface\n");
+	return;	/* no matching interface */
+match_done:
+	setenv("boot.netif.name", ifp->if_xname);
+	if (is_nfsv3 != 0) {
+		strlcpy(nd3->myif.ifra_name, ifp->if_xname,
+		    sizeof(nd3->myif.ifra_name));
+	
+		/* set up gateway */
+		inaddr_to_sockaddr("boot.netif.gateway", &nd3->mygateway);
+
+		/* set up root mount */
+		nd3->root_args.rsize = 32768;		/* XXX tunable? */
+		nd3->root_args.wsize = 32768;
+		nd3->root_args.sotype = SOCK_STREAM;
+		nd3->root_args.flags = (NFSMNT_NFSV3 | NFSMNT_WSIZE |
+		    NFSMNT_RSIZE | NFSMNT_RESVPORT);
+		if (inaddr_to_sockaddr("boot.nfsroot.server",
+		    &nd3->root_saddr)) {
+			printf("nfs_diskless: no server\n");
+			return;
+		}
+		nd3->root_saddr.sin_port = htons(NFS_PORT);
+		fhlen = decode_nfshandle("boot.nfsroot.nfshandle",
+		    &nd3->root_fh[0], NFSX_V3FHMAX);
+		if (fhlen == 0) {
+			printf("nfs_diskless: no NFS handle\n");
+			return;
+		}
+		if (fhlen != nd3->root_fhsize) {
+			printf("nfs_diskless: bad NFS handle len=%d\n", fhlen);
+			return;
+		}
+		if ((cp = getenv("boot.nfsroot.path")) != NULL) {
+			strncpy(nd3->root_hostnam, cp, MNAMELEN - 1);
+			freeenv(cp);
+		}
+		if ((cp = getenv("boot.nfsroot.options")) != NULL) {
+			nfs_parse_options(cp, &nd3->root_args);
+			freeenv(cp);
+		}
+	
+		nfs_diskless_valid = 3;
+	} else {
+		strlcpy(nd->myif.ifra_name, ifp->if_xname,
+		    sizeof(nd->myif.ifra_name));
+	
+		/* set up gateway */
+		inaddr_to_sockaddr("boot.netif.gateway", &nd->mygateway);
+
+		/* set up root mount */
+		nd->root_args.rsize = 8192;		/* XXX tunable? */
+		nd->root_args.wsize = 8192;
+		nd->root_args.sotype = SOCK_STREAM;
+		nd->root_args.flags = (NFSMNT_WSIZE |
+		    NFSMNT_RSIZE | NFSMNT_RESVPORT);
+		if (inaddr_to_sockaddr("boot.nfsroot.server",
+		    &nd->root_saddr)) {
+			printf("nfs_diskless: no server\n");
+			return;
+		}
+		nd->root_saddr.sin_port = htons(NFS_PORT);
+		if (decode_nfshandle("boot.nfsroot.nfshandle",
+		    &nd->root_fh[0], NFSX_V2FH) == 0) {
+			printf("nfs_diskless: no NFS handle\n");
+			return;
+		}
+		if ((cp = getenv("boot.nfsroot.path")) != NULL) {
+			strncpy(nd->root_hostnam, cp, MNAMELEN - 1);
+			freeenv(cp);
+		}
+		if ((cp = getenv("boot.nfsroot.options")) != NULL) {
+			struct nfs_args args;
+	
+			/*
+			 * XXX yech, convert between old and current
+			 * arg format
+			 */
+			args.flags = nd->root_args.flags;
+			args.sotype = nd->root_args.sotype;
+			args.rsize = nd->root_args.rsize;
+			args.wsize = nd->root_args.wsize;
+			nfs_parse_options(cp, &args);
+			nd->root_args.flags = args.flags;
+			nd->root_args.sotype = args.sotype;
+			nd->root_args.rsize = args.rsize;
+			nd->root_args.wsize = args.wsize;
+			freeenv(cp);
+		}
+	
+		nfs_diskless_valid = 1;
+	}
+}
+
+static int
+inaddr_to_sockaddr(char *ev, struct sockaddr_in *sa)
+{
+	u_int32_t a[4];
+	char *cp;
+	int count;
+
+	bzero(sa, sizeof(*sa));
+	sa->sin_len = sizeof(*sa);
+	sa->sin_family = AF_INET;
+
+	if ((cp = getenv(ev)) == NULL)
+		return (1);
+	count = sscanf(cp, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]);
+	freeenv(cp);
+	if (count != 4)
+		return (1);
+	sa->sin_addr.s_addr =
+	    htonl((a[0] << 24) | (a[1] << 16) | (a[2] << 8) | a[3]);
+	return (0);
+}
+
+static int
+hwaddr_to_sockaddr(char *ev, struct sockaddr_dl *sa)
+{
+	char *cp;
+	u_int32_t a[6];
+	int count;
+
+	bzero(sa, sizeof(*sa));
+	sa->sdl_len = sizeof(*sa);
+	sa->sdl_family = AF_LINK;
+	sa->sdl_type = IFT_ETHER;
+	sa->sdl_alen = ETHER_ADDR_LEN;
+	if ((cp = getenv(ev)) == NULL)
+		return (1);
+	count = sscanf(cp, "%x:%x:%x:%x:%x:%x",
+	    &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]);
+	freeenv(cp);
+	if (count != 6)
+		return (1);
+	sa->sdl_data[0] = a[0];
+	sa->sdl_data[1] = a[1];
+	sa->sdl_data[2] = a[2];
+	sa->sdl_data[3] = a[3];
+	sa->sdl_data[4] = a[4];
+	sa->sdl_data[5] = a[5];
+	return (0);
+}
+
+static int
+decode_nfshandle(char *ev, u_char *fh, int maxfh) 
+{
+	u_char *cp, *ep;
+	int len, val;
+
+	ep = cp = getenv(ev);
+	if (cp == NULL)
+		return (0);
+	if ((strlen(cp) < 2) || (*cp != 'X')) {
+		freeenv(ep);
+		return (0);
+	}
+	len = 0;
+	cp++;
+	for (;;) {
+		if (*cp == 'X') {
+			freeenv(ep);
+			return (len);
+		}
+		if ((sscanf(cp, "%2x", &val) != 1) || (val > 0xff)) {
+			freeenv(ep);
+			return (0);
+		}
+		*(fh++) = val;
+		len++;
+		cp += 2;
+		if (len > maxfh) {
+		    freeenv(ep);
+		    return (0);
+		}
+	}
+}
+
+#if !defined(BOOTP_NFSROOT)
+static void
+nfs_rootconf(void)
+{
+
+	nfs_setup_diskless();
+	if (nfs_diskless_valid)
+		rootdevnames[0] = "nfs:";
+}
+
+SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, nfs_rootconf, NULL);
+#endif
+
diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h
new file mode 100644
index 0000000..aa2bc04
--- /dev/null
+++ b/sys/nfs/nfsdiskless.h
@@ -0,0 +1,114 @@
+/*-
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Rick Macklem at The University of Guelph.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
+ * $FreeBSD$
+ */
+
+#ifndef _NFSCLIENT_NFSDISKLESS_H_
+#define _NFSCLIENT_NFSDISKLESS_H_
+
+/*
+ * Structure that must be initialized for a diskless nfs client.
+ * This structure is used by nfs_mountroot() to set up the root vnode,
+ * and to do a partial ifconfig(8) and route(8) so that the critical net
+ * interface can communicate with the server.
+ * The primary bootstrap is expected to fill in the appropriate fields before
+ * starting the kernel.
+ * Currently only works for AF_INET protocols.
+ * NB: All fields are stored in net byte order to avoid hassles with
+ * client/server byte ordering differences.
+ */
+
+/*
+ * I have defined a new structure that can handle an NFS Version 3 file handle
+ * but the kernel still expects the old Version 2 one to be provided. The
+ * changes required in nfs_vfsops.c for using the new are documented there in
+ * comments. (I felt that breaking network booting code by changing this
+ * structure would not be prudent at this time, since almost all servers are
+ * still Version 2 anyhow.)
+ */
+struct nfsv3_diskless {
+	struct ifaliasreq myif;			/* Default interface */
+	struct sockaddr_in mygateway;		/* Default gateway */
+	struct nfs_args	root_args;		/* Mount args for root fs */
+	int		root_fhsize;		/* Size of root file handle */
+	u_char		root_fh[NFSX_V3FHMAX];	/* File handle of root dir */
+	struct sockaddr_in root_saddr;		/* Address of root server */
+	char		root_hostnam[MNAMELEN];	/* Host name for mount pt */
+	long		root_time;		/* Timestamp of root fs */
+	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
+};
+
+/*
+ * Old arguments to mount NFS
+ */
+struct onfs_args {
+	struct sockaddr	*addr;		/* file server address */
+	int		addrlen;	/* length of address */
+	int		sotype;		/* Socket type */
+	int		proto;		/* and Protocol */
+	u_char		*fh;		/* File handle to be mounted */
+	int		fhsize;		/* Size, in bytes, of fh */
+	int		flags;		/* flags */
+	int		wsize;		/* write size in bytes */
+	int		rsize;		/* read size in bytes */
+	int		readdirsize;	/* readdir size in bytes */
+	int		timeo;		/* initial timeout in .1 secs */
+	int		retrans;	/* times to retry send */
+	int		maxgrouplist;	/* Max. size of group list */
+	int		readahead;	/* # of blocks to readahead */
+	int		leaseterm;	/* Term (sec) of lease */
+	int		deadthresh;	/* Retrans threshold */
+	char		*hostname;	/* server's name */
+};
+
+struct nfs_diskless {
+	struct ifaliasreq myif;			/* Default interface */
+	struct sockaddr_in mygateway;		/* Default gateway */
+	struct onfs_args root_args;		/* Mount args for root fs */
+	u_char		root_fh[NFSX_V2FH];	/* File handle of root dir */
+	struct sockaddr_in root_saddr;		/* Address of root server */
+	char		root_hostnam[MNAMELEN];	/* Host name for mount pt */
+	long		root_time;		/* Timestamp of root fs */
+	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
+};
+
+#ifdef _KERNEL
+extern struct nfsv3_diskless nfsv3_diskless;
+extern struct nfs_diskless nfs_diskless;
+extern int	nfs_diskless_valid;
+void bootpc_init(void);
+void nfs_setup_diskless(void);
+void nfs_parse_options(const char *, struct nfs_args *);
+#endif
+
+#endif