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
This commit is contained in:
Edward Tomasz Napierala 2016-09-20 04:52:01 +00:00
parent 19b7fe02c4
commit 921bf145a6
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=306011
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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}"