diff options
Diffstat (limited to 'contrib/amd/scripts')
| -rw-r--r-- | contrib/amd/scripts/amd.conf-sample | 8 | ||||
| -rw-r--r-- | contrib/amd/scripts/amd.conf.5 | 41 | ||||
| -rw-r--r-- | contrib/amd/scripts/automount2amd.8 | 11 | ||||
| -rwxr-xr-x | contrib/amd/scripts/fixrmtab.in | 20 |
4 files changed, 49 insertions, 31 deletions
diff --git a/contrib/amd/scripts/amd.conf-sample b/contrib/amd/scripts/amd.conf-sample index 880a74b..4d96578 100644 --- a/contrib/amd/scripts/amd.conf-sample +++ b/contrib/amd/scripts/amd.conf-sample @@ -64,8 +64,8 @@ nis_domain = nisDom-CS.columbia.edu # (amd -x) log_options = fatal,error,user,warn,info,map,stats,all # (amd -D) -debug_options = all,amq,daemon,fork,full,hrtime,info,mem,mtab,\ - str,readdir,test,trace,xdrtrace +debug_options = all,defaults,test,amq,daemon,fork,\ + full,hrtime,info,mem,mtab,str,readdir,trace,xdrtrace # path for mtab file during mtab debug mode debug_mtab_file = /tmp/mnttab # (amd -S) @@ -108,7 +108,7 @@ exec_map_timeout = 10 normalize_slashes = yes | no ############################################################################## -# these 8 global options can be overridden by each map individually +# these 9 global options can be overridden by each map individually browsable_dirs = no | yes | full map_options = cache:=all map_type = file|hesiod|ndbm|nis|nisplus|passwd|union|ldap @@ -119,6 +119,8 @@ autofs_use_lofs = yes | no search_path = /etc/local:/etc/amdmaps:/misc/yp # selectors are not recognized by default in the /defaults entry selectors_in_defaults = no | yes +# does this map use Sun Automounter map syntax? +sun_map_syntax = no | yes ############################################################################## ############################################################################## diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5 index 5967e8f..1adc2ba 100644 --- a/contrib/amd/scripts/amd.conf.5 +++ b/contrib/amd/scripts/amd.conf.5 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2006 Erez Zadok +.\" Copyright (c) 1997-2014 Erez Zadok .\" Copyright (c) 1990 Jan-Simon Pendry .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1990 The Regents of the University of California. @@ -16,11 +16,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgment: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -36,9 +32,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" %W% (Berkeley) %G% .\" -.\" $Id: amd.conf.5,v 1.39.2.5 2006/04/21 01:12:04 ezk Exp $ +.\" File: am-utils/scripts/amd.conf.5 .\" $FreeBSD$ .\" .Dd February 26, 2016 @@ -274,8 +269,14 @@ slow slip-based networks as follows: wire!=slip-net;opts:=intr,rsize=8192,wsize=8192 .Ed Deprecated form: selectors_on_default +.TP +.BR sun_map_syntax " (boolean, default=no)" +If "yes," then Amd will parse the map according to the Sun Automount syntax. + +.\" ************************************************************************** .El .Ss "Parameters applicable to the global section only" + .Bl -tag -width 4n .It Va arch Pq string, default to compiled in value Same as the @@ -345,12 +346,13 @@ option to Specify any debugging options for .Xr amd 8 . Works only if +Works only if am-utils was configured for debugging using the .Fl Fl enable-debug option. The .Cm mem -option alone can be turned on via +option, as well as all other options, can be turned on via .Fl Fl enable-debug Ns = Ns Cm mem . Otherwise debugging options are ignored. Options are @@ -364,7 +366,9 @@ Possible values are: .Pp .Bl -tag -width ".Cm xdrtrace" -compact .It Cm all -all options +all options (excludes hrtime and mtab) +.It Cm defaults +"sensible" default options (all--excluding hrtime, mtab, and xdrtrace) .It Cm amq register for .Xr amq 8 @@ -374,6 +378,8 @@ enter daemon mode fork server .It Cm full program trace +.It Cm hrtime +print high resolution time stamps (only if syslog(3) is not used) .It Cm info info service specific debugging (hesiod, nis, etc.) @@ -383,14 +389,16 @@ trace memory allocations use local .Pa ./mtab file +\fBreaddir\fR show browsable_dirs progress .It Cm str debug string munging .It Cm test -full debug but no daemon +full debug options plus mtab,nodaemon,nofork,noamq .It Cm trace trace protocol and NFS mount arguments .It Cm xdrtrace trace XDR routines +.BR dismount_interval " (numeric, default=120)" .El .It Va dismount_interval Pq numeric, default=120 Same as the @@ -580,12 +588,14 @@ Possible values are: .Bl -tag -width ".Cm warning" -compact .It Cm all all messages +.It Cm defaults +default messages (fatal,error,user,warning,info) .It Cm debug debug messages .It Cm error -non-fatal system errors +non-fatal system errors (cannot be turned off) .It Cm fatal -fatal errors +fatal errors (cannot be turned off) .It Cm info information .It Cm map @@ -596,6 +606,7 @@ additional statistical information non-fatal user errors .It Cm warn warnings +\fBwarning\fR warnings .It Cm warning warnings .El @@ -1074,7 +1085,9 @@ map_name = amd.tftpboot .Sh SEE ALSO .Xr hosts_access 5 , .Xr amd 8 , -.Xr amq 8 +.Xr amq 8 , +.xr automount 8 , +.Xr ctl-amd 8 . .Pp .Dq am-utils .Xr info 1 diff --git a/contrib/amd/scripts/automount2amd.8 b/contrib/amd/scripts/automount2amd.8 index bd3b612..f9a04d9 100644 --- a/contrib/amd/scripts/automount2amd.8 +++ b/contrib/amd/scripts/automount2amd.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2006 Erez Zadok +.\" Copyright (c) 1997-2014 Erez Zadok .\" Copyright (c) 1990 Jan-Simon Pendry .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1990 The Regents of the University of California. @@ -16,11 +16,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgment: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -36,9 +32,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" %W% (Berkeley) %G% .\" -.\" $Id: automount2amd.8,v 1.8.2.1 2006/01/02 18:48:26 ezk Exp $ +.\" File: am-utils/scripts/automount2amd.8 .\" .TH AUTOMOUNT2AMD 8L "24 May 1993" .SH NAME diff --git a/contrib/amd/scripts/fixrmtab.in b/contrib/amd/scripts/fixrmtab.in index 2300380..a1fbebf 100755 --- a/contrib/amd/scripts/fixrmtab.in +++ b/contrib/amd/scripts/fixrmtab.in @@ -10,15 +10,23 @@ #set -x -RMTAB=/etc/rmtab -TMP=/tmp/rmtab.$$ +# allow user to pass RMTAB file name from environment +if test -z "${RMTAB}" ; then + RMTAB=/etc/rmtab +fi -if [ ! -f /etc/rmtab ]; then +if [ ! -f "$RMTAB" ]; then exit 0 fi -for host in $* +TMP="$(mktemp ${RMTAB}.XXXXXX)" +if [ -z "$TMP" ]; then + exit 1 +fi + +trap "rm -f $TMP" 0 1 2 3 15 + +for host do - sed -e '/^'$host':/s/^./#/' $RMTAB > $TMP && cp $TMP $RMTAB + sed -e "/^$host:/s/^./#/" "$RMTAB" > "$TMP" && cp "$TMP" "$RMTAB" done -rm -f $TMP |
