From owner-cvs-all@FreeBSD.ORG  Tue Jan 23 07:17:11 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 52DC716A401;
	Tue, 23 Jan 2007 07:17:11 +0000 (UTC)
	(envelope-from rodrigc@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 2AA6513C457;
	Tue, 23 Jan 2007 07:17:11 +0000 (UTC)
	(envelope-from rodrigc@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 l0N7HBuf040944;
	Tue, 23 Jan 2007 07:17:11 GMT
	(envelope-from rodrigc@repoman.freebsd.org)
Received: (from rodrigc@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0N7HBUa040943;
	Tue, 23 Jan 2007 07:17:11 GMT (envelope-from rodrigc)
Message-Id: <200701230717.l0N7HBUa040943@repoman.freebsd.org>
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Tue, 23 Jan 2007 07:17:10 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sbin/mount_nfs mount_nfs.8 mount_nfs.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Jan 2007 07:17:11 -0000

rodrigc     2007-01-23 07:17:10 UTC

  FreeBSD src repository

  Modified files:
    sbin/mount_nfs       mount_nfs.8 mount_nfs.c 
  Log:
  Merge mount_nfs4.c and mount_nfs.c into one program.
  If argv[0] == "mount_nfs4", then default to mounting NFSv4,
  otherwise if argv[0] == "mount_nfs", default to the old mount_nfs behavior.
  
  - Add a -4 option.
  - Add the University of Michigan copyright from mount_nfs4.c, for the
    code merged from mount_nfs4.c.
  
  Reviewed by:    rees
  
  Revision  Changes    Path
  1.46      +4 -2      src/sbin/mount_nfs/mount_nfs.8
  1.71      +244 -5    src/sbin/mount_nfs/mount_nfs.c