svn commit: r283242 - in stable/10: etc etc/autofs usr.sbin/autofs
Edward Tomasz Napierala
trasz at FreeBSD.org
Thu May 21 13:42:39 UTC 2015
Author: trasz
Date: Thu May 21 13:42:37 2015
New Revision: 283242
URL: https://svnweb.freebsd.org/changeset/base/283242
Log:
MFC r279955:
Add -noauto autofs map, for automatic handling of fstab entries
marked "noauto".
Relnotes: yes
Sponsored by: The FreeBSD Foundation
Added:
stable/10/etc/autofs/special_noauto
- copied unchanged from r279955, head/etc/autofs/special_noauto
Modified:
stable/10/etc/auto_master
stable/10/etc/autofs/Makefile
stable/10/usr.sbin/autofs/auto_master.5
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/auto_master
==============================================================================
--- stable/10/etc/auto_master Thu May 21 13:41:08 2015 (r283241)
+++ stable/10/etc/auto_master Thu May 21 13:42:37 2015 (r283242)
@@ -6,3 +6,4 @@
# 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
+#/- -noauto
Modified: stable/10/etc/autofs/Makefile
==============================================================================
--- stable/10/etc/autofs/Makefile Thu May 21 13:41:08 2015 (r283241)
+++ stable/10/etc/autofs/Makefile Thu May 21 13:42:37 2015 (r283242)
@@ -1,6 +1,6 @@
# $FreeBSD$
-FILES= include_ldap special_hosts special_media special_null
+FILES= include_ldap special_hosts special_media special_noauto special_null
NO_OBJ=
FILESDIR= /etc/autofs
Copied: stable/10/etc/autofs/special_noauto (from r279955, head/etc/autofs/special_noauto)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/etc/autofs/special_noauto Thu May 21 13:42:37 2015 (r283242, copy of r279955, head/etc/autofs/special_noauto)
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+print_available() {
+ sed 's/#.*//' /etc/fstab | awk '$4 ~ /noauto/ { print $2 }'
+}
+
+print_one() {
+ local _mntpoint
+
+ _mntpoint="${1%/}"
+
+ sed 's/#.*//' /etc/fstab | awk '
+ $2 == "'"${_mntpoint}"'" && $4 ~ /noauto/ {
+ if ($1 ~ /:/) { dev=$1 } else { dev=":"$1 }
+ print "-fstype=" $3 "," $4, dev
+ }'
+}
+
+if [ $# -eq 0 ]; then
+ print_available
+ exit 0
+fi
+
+print_one "$1"
+exit 0
+
Modified: stable/10/usr.sbin/autofs/auto_master.5
==============================================================================
--- stable/10/usr.sbin/autofs/auto_master.5 Thu May 21 13:41:08 2015 (r283241)
+++ stable/10/usr.sbin/autofs/auto_master.5 Thu May 21 13:42:37 2015 (r283242)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 9, 2015
+.Dd March 13, 2015
.Dt AUTO_MASTER 5
.Os
.Sh NAME
@@ -260,6 +260,11 @@ when they are automatically created.
.It Li -media
Query devices that are not yet mounted, but contain valid filesystems.
Generally used to access files on removable media.
+.It Li -noauto
+Mount filesystems configured in
+.Xr fstab 5
+as "noauto".
+This needs to be set up as a direct map.
.It Li -null
Prevent
.Xr automountd 8
More information about the svn-src-all
mailing list