From owner-svn-src-head@freebsd.org  Tue Sep 20 04:52:02 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83EB7BE01F8;
 Tue, 20 Sep 2016 04:52:02 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 541D41781;
 Tue, 20 Sep 2016 04:52:02 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8K4q1ao024261;
 Tue, 20 Sep 2016 04:52:01 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8K4q1uc024259;
 Tue, 20 Sep 2016 04:52:01 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201609200452.u8K4q1uc024259@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 20 Sep 2016 04:52:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306011 - in head/etc: . autofs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Sep 2016 04:52:02 -0000

Author: trasz
Date: Tue Sep 20 04:52:01 2016
New Revision: 306011
URL: https://svnweb.freebsd.org/changeset/base/306011

Log:
  Stop appending "noatime" in the autofs -media map, and instead add it
  to auto_master, since all filesystems seem to support it.  It's cleaner
  this way, and easier to customize.
  
  MFC after:	1 month

Modified:
  head/etc/auto_master
  head/etc/autofs/special_media

Modified: head/etc/auto_master
==============================================================================
--- head/etc/auto_master	Tue Sep 20 04:50:53 2016	(r306010)
+++ head/etc/auto_master	Tue Sep 20 04:52:01 2016	(r306011)
@@ -5,5 +5,5 @@
 /net		-hosts		-nobrowse,nosuid,intr
 # When using the -media special map, make sure to edit devd.conf(5)
 # to move the call to "automount -c" out of the comments section.
-#/media		-media		-nosuid
+#/media		-media		-nosuid,noatime
 #/-		-noauto

Modified: head/etc/autofs/special_media
==============================================================================
--- head/etc/autofs/special_media	Tue Sep 20 04:50:53 2016	(r306010)
+++ head/etc/autofs/special_media	Tue Sep 20 04:52:01 2016	(r306011)
@@ -41,7 +41,7 @@ print_map_entry() {
 	case "${_fstype}" in
 	"ntfs")
 		if [ -f "/usr/local/bin/ntfs-3g" ]; then
-			echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},nosuid,noatime	:/dev/${_p}" 
+			echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},nosuid	:/dev/${_p}" 
 		else
 			/usr/bin/logger -p info -t "special_media[$$]" \
 			    "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-ntfs first"
@@ -49,7 +49,7 @@ print_map_entry() {
 		fi
 		;;
 	"ext2fs" | "msdosfs" | "ufs")
-		echo "-fstype=${_fstype},nosuid,noatime,async	:/dev/${_p}" 
+		echo "-fstype=${_fstype},nosuid,async	:/dev/${_p}" 
 		;;
 	*)
 		echo "-fstype=${_fstype},nosuid	:/dev/${_p}"