From owner-svn-src-stable-9@FreeBSD.ORG  Sun Sep  2 18:08:42 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 403351065670;
	Sun,  2 Sep 2012 18:08:42 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B1768FC0A;
	Sun,  2 Sep 2012 18:08:42 +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 q82I8gBB046395;
	Sun, 2 Sep 2012 18:08:42 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q82I8fji046393;
	Sun, 2 Sep 2012 18:08:41 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201209021808.q82I8fji046393@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 2 Sep 2012 18:08:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240033 - stable/9/sbin/mount
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Sep 2012 18:08:42 -0000

Author: eadler
Date: Sun Sep  2 18:08:41 2012
New Revision: 240033
URL: http://svn.freebsd.org/changeset/base/240033

Log:
  MFC r238399:
  	Document the behavior of mount with failok specified.
  
  PR:		docs/163742
  Approved by:	cperciva (implicit)

Modified:
  stable/9/sbin/mount/mount.8
Directory Properties:
  stable/9/sbin/mount/   (props changed)

Modified: stable/9/sbin/mount/mount.8
==============================================================================
--- stable/9/sbin/mount/mount.8	Sun Sep  2 18:04:50 2012	(r240032)
+++ stable/9/sbin/mount/mount.8	Sun Sep  2 18:08:41 2012	(r240033)
@@ -28,7 +28,7 @@
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
 .\" $FreeBSD$
 .\"
-.Dd June 6, 2011
+.Dd July 12, 2012
 .Dt MOUNT 8
 .Os
 .Sh NAME
@@ -145,6 +145,11 @@ When used with the
 .Fl u
 flag, this is the same as specifying the options currently in effect for
 the mounted file system.
+.It Cm failok
+If this option is specified,
+.Nm
+will return 0 even if an error occurs
+during the mount of the filesystem.
 .It Cm force
 The same as
 .Fl f ;