From owner-svn-src-all@FreeBSD.ORG  Mon Jul 15 21:57:22 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3AD73EFF;
 Mon, 15 Jul 2013 21:57:22 +0000 (UTC) (envelope-from rmh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2DDD5D39;
 Mon, 15 Jul 2013 21:57:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6FLvMMj063250;
 Mon, 15 Jul 2013 21:57:22 GMT (envelope-from rmh@svn.freebsd.org)
Received: (from rmh@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6FLvLpH063248;
 Mon, 15 Jul 2013 21:57:21 GMT (envelope-from rmh@svn.freebsd.org)
Message-Id: <201307152157.r6FLvLpH063248@svn.freebsd.org>
From: Robert Millan <rmh@FreeBSD.org>
Date: Mon, 15 Jul 2013 21:57:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253372 - head/sbin/mount
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 15 Jul 2013 21:57:22 -0000

Author: rmh
Date: Mon Jul 15 21:57:21 2013
New Revision: 253372
URL: http://svnweb.freebsd.org/changeset/base/253372

Log:
  Add -n flag for compatibility with Linux version of mount(8).
  
  Reviewed by: freebsd-fs, eadler, mckusick, jh, wblock

Modified:
  head/sbin/mount/mount.8
  head/sbin/mount/mount.c

Modified: head/sbin/mount/mount.8
==============================================================================
--- head/sbin/mount/mount.8	Mon Jul 15 20:33:54 2013	(r253371)
+++ head/sbin/mount/mount.8	Mon Jul 15 21:57:21 2013	(r253372)
@@ -118,6 +118,9 @@ When used in conjunction with the
 .Fl a
 option, also mount those file systems which are marked as
 .Dq Li late .
+.It Fl n
+For compatibility with some other implementations, this flag is
+currently a no-op.
 .It Fl o
 Options are specified with a
 .Fl o

Modified: head/sbin/mount/mount.c
==============================================================================
--- head/sbin/mount/mount.c	Mon Jul 15 20:33:54 2013	(r253371)
+++ head/sbin/mount/mount.c	Mon Jul 15 21:57:21 2013	(r253372)
@@ -253,7 +253,7 @@ main(int argc, char *argv[])
 	options = NULL;
 	vfslist = NULL;
 	vfstype = "ufs";
-	while ((ch = getopt(argc, argv, "adF:fLlo:prt:uvw")) != -1)
+	while ((ch = getopt(argc, argv, "adF:fLlno:prt:uvw")) != -1)
 		switch (ch) {
 		case 'a':
 			all = 1;
@@ -274,6 +274,9 @@ main(int argc, char *argv[])
 		case 'l':
 			late = 1;
 			break;
+		case 'n':
+			/* For compatibility with the Linux version of mount. */
+			break;
 		case 'o':
 			if (*optarg) {
 				options = catopt(options, optarg);