diff options
author | dteske <dteske@FreeBSD.org> | 2016-12-13 04:44:06 +0000 |
---|---|---|
committer | dteske <dteske@FreeBSD.org> | 2016-12-13 04:44:06 +0000 |
commit | 468a7dfd1acbee3e40c9b1e87d0871eb90a4bd1c (patch) | |
tree | b368b26011ba6ae16786a4aa52d7baa967775c02 | |
parent | 21981f8367ff19e29200058647ad6a03567cb788 (diff) | |
download | FreeBSD-src-468a7dfd1acbee3e40c9b1e87d0871eb90a4bd1c.zip FreeBSD-src-468a7dfd1acbee3e40c9b1e87d0871eb90a4bd1c.tar.gz |
MFC r306011 [trasz]:
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.
-rw-r--r-- | etc/auto_master | 2 | ||||
-rwxr-xr-x | etc/autofs/special_media | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/auto_master b/etc/auto_master index 255b7f8..55ee991 100644 --- a/etc/auto_master +++ b/etc/auto_master @@ -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 diff --git a/etc/autofs/special_media b/etc/autofs/special_media index 86824b6..a9c4b1b 100755 --- a/etc/autofs/special_media +++ b/etc/autofs/special_media @@ -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}" |