From owner-svn-src-all@FreeBSD.ORG  Wed May 18 14:02:33 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D2628106566B;
	Wed, 18 May 2011 14:02:33 +0000 (UTC) (envelope-from ru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C23EE8FC0A;
	Wed, 18 May 2011 14:02:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4IE2Xmp094764;
	Wed, 18 May 2011 14:02:33 GMT (envelope-from ru@svn.freebsd.org)
Received: (from ru@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4IE2XSd094762;
	Wed, 18 May 2011 14:02:33 GMT (envelope-from ru@svn.freebsd.org)
Message-Id: <201105181402.p4IE2XSd094762@svn.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Wed, 18 May 2011 14:02:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222056 - stable/8/sys/nfs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 May 2011 14:02:33 -0000

Author: ru
Date: Wed May 18 14:02:33 2011
New Revision: 222056
URL: http://svn.freebsd.org/changeset/base/222056

Log:
  r221933 vanished support for "nocto" in boot.nfsroot.options loader
  tunable; fix it by redoing a merge of r221436.

Modified:
  stable/8/sys/nfs/nfs_diskless.c

Modified: stable/8/sys/nfs/nfs_diskless.c
==============================================================================
--- stable/8/sys/nfs/nfs_diskless.c	Wed May 18 11:38:36 2011	(r222055)
+++ stable/8/sys/nfs/nfs_diskless.c	Wed May 18 14:02:33 2011	(r222056)
@@ -112,6 +112,8 @@ nfs_parse_options(const char *envopts, s
 			nd->flags |= NFSMNT_NOCONN;
 		else if (strcmp(o, "nolockd") == 0)
 			nd->flags |= NFSMNT_NOLOCKD;
+		else if (strcmp(o, "nocto") == 0)
+			nd->flags |= NFSMNT_NOCTO;
 		else if (strcmp(o, "nfsv2") == 0)
 			nd->flags &= ~(NFSMNT_NFSV3 | NFSMNT_NFSV4);
 		else if (strcmp(o, "nfsv3") == 0) {