From: Erez Zadok Date: Wed, 19 Apr 2006 01:58:16 +0000 (+0000) Subject: minor refomatting (emacs) X-Git-Tag: am-utils-6_2a2~5 X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=7018a199f745dd90efc8b3c7677ae56b9687752e;p=am-utils-6.0.git minor refomatting (emacs) --- diff --git a/ChangeLog b/ChangeLog index 018d8f8..1e991f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2006-04-18 Christos Zoulas +2006-04-18 Christos Zoulas * amd/opts.c: Add support for optionally specifying the hostname to match against the netgroup in the netgrp and netgrpd selectors. diff --git a/NEWS b/NEWS index 6d3e124..eed764f 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ *** Notes specific to am-utils version 6.2a2 -Add support for specifying the host to match in the mount selectors -netgrp and netgrpd. Now one can use either netgrp() or +Add support for specifying the host to match in the mount selectors netgrp +and netgrpd. Now one can use either netgrp() or netgrp(,). Support new mount options for type:=pcfs mounts: longname, nowin95, diff --git a/amd/opts.c b/amd/opts.c index cddc993..63e2877 100644 --- a/amd/opts.c +++ b/amd/opts.c @@ -904,7 +904,6 @@ f_netgrp(char *arg) } else { nhost = opt_host; } - status = innetgr(arg, nhost, NULL, NULL); dlog("netgrp = %s status = %d host = %s", arg, status, nhost); if (ptr) diff --git a/doc/am-utils.texi b/doc/am-utils.texi index 9bec66e..398df95 100644 --- a/doc/am-utils.texi +++ b/doc/am-utils.texi @@ -1792,32 +1792,34 @@ Always evaluates to false. @i{ARG} is ignored. @cindex Mount selector; netgrp @cindex Selector; netgrp -The argument @i{ARG} of this selector is a netgroup name followed optionally -by a comma and a host name. If the host name is not specified, it -defaults to @code{$@{host@}}. If the host name (short name) is a member -of the netgroup, this selector evaluates to true. Otherwise it evaluates -to false. +The argument @i{ARG} of this selector is a netgroup name followed +optionally by a comma and a host name. If the host name is not +specified, it defaults to @code{$@{host@}}. If the host name (short +name) is a member of the netgroup, this selector evaluates to true. +Otherwise it evaluates to false. For example, suppose you have a netgroup @samp{ppp-hosts}, and for -reasons of performance, these have a local @file{/home} partition, while -all other clients on the faster network can access a shared home -directory. A common map to use for both might look like the following: +reasons of performance, these have a local @file{/home} partition, +while all other clients on the faster network can access a shared home +directory. A common map to use for both might look like the +following: @example home/* netgrp(ppp-hosts);type:=link;fs:=/local/$@{key@} \ !netgrp(ppp-hosts);type:=nfs;rhost:=serv1;rfs:=/remote/$@{key@} @end example -A more complex example that takes advantage of the two argument -netgrp mount selector is given in the following scenario. Suppose -one wants to mount the local scratch space from a each host under +A more complex example that takes advantage of the two argument netgrp +mount selector is given in the following scenario. Suppose one wants +to mount the local scratch space from a each host under @file{scratch/} and some hosts have their scratch space in a -different path than others. Hosts in the netgroup @samp{apple-hosts} -have their scratch space in the @file{/apple} path, where hosts -in the netgroup @samp{cherry-hosts} have their scratch space in the -@file{/cherry} path. For hosts that are neither in the @samp{apple-hosts} -or @samp{cherry-hosts} netgroups we want to make a symlink pointing to -nowhere but provide a descriptive error message in the link destination: +different path than others. Hosts in the netgroup @samp{apple-hosts} +have their scratch space in the @file{/apple} path, where hosts in the +netgroup @samp{cherry-hosts} have their scratch space in the +@file{/cherry} path. For hosts that are neither in the +@samp{apple-hosts} or @samp{cherry-hosts} netgroups we want to make a +symlink pointing to nowhere but provide a descriptive error message in +the link destination: @example scratch/* netgrp(apple-hosts,$@{/key@});type:=nfs;rhost:=$@{/key@};\ @@ -1837,15 +1839,15 @@ scratch/* netgrp(apple-hosts,$@{/key@});type:=nfs;rhost:=$@{/key@};\ @cindex Mount selector; netgrpd @cindex Selector; netgrpd -The argument @i{ARG} of this selector is a netgroup name followed optionally -by a comma and a host name. If the host name is not specified, it -defaults to @code{$@{hostd@}}. If the host name (fully-qualified name) -is a member of the netgroup, this selector evaluates to true. Otherwise -it evaluates to false. +The argument @i{ARG} of this selector is a netgroup name followed +optionally by a comma and a host name. If the host name is not +specified, it defaults to @code{$@{hostd@}}. If the host name +(fully-qualified name) is a member of the netgroup, this selector +evaluates to true. Otherwise it evaluates to false. -The @samp{netgrpd} function uses fully-qualified host names -to match netgroup names, while the @samp{netgrp} -function (@pxref{netgrp Selector Function}) uses short host names. +The @samp{netgrpd} function uses fully-qualified host names to match +netgroup names, while the @samp{netgrp} function (@pxref{netgrp +Selector Function}) uses short host names. @c ---------------------------------------------------------------- @node in_network Selector Function, true Selector Function, netgrpd Selector Function, Selectors