From owner-p4-projects@FreeBSD.ORG  Tue Nov  7 18:11:26 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5567D16A4CA; Tue,  7 Nov 2006 18:11:26 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0D26F16A494
	for <perforce@freebsd.org>; Tue,  7 Nov 2006 18:11:26 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C29FA43D5A
	for <perforce@freebsd.org>; Tue,  7 Nov 2006 18:11:18 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA7IBIKk014481
	for <perforce@freebsd.org>; Tue, 7 Nov 2006 18:11:18 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA7IBI0X014477
	for perforce@freebsd.org; Tue, 7 Nov 2006 18:11:18 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 7 Nov 2006 18:11:18 GMT
Message-Id: <200611071811.kA7IBI0X014477@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109459 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Nov 2006 18:11:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=109459

Change 109459 by sam@sam_ebb on 2006/11/07 18:11:06

	loopback bootp fix

Affected files ...

.. //depot/projects/arm/src/sys/nfsclient/bootp_subr.c#4 integrate

Differences ...

==== //depot/projects/arm/src/sys/nfsclient/bootp_subr.c#4 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.66 2006/06/29 19:22:05 yar Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.67 2006/11/07 18:02:45 sam Exp $");
 
 #include "opt_bootp.h"
 
@@ -1277,6 +1277,8 @@
 		args->flags |= NFSMNT_SOFT;
 	if ((tmp = (char *)substr(p, "noconn")))
 		args->flags |= NFSMNT_NOCONN;
+	if ((tmp = (char *)substr(p, "nolockd")))
+		args->flags |= NFSMNT_NOLOCKD;
 	if ((tmp = (char *)substr(p, "tcp")))
 		args->sotype = SOCK_STREAM;
 }