Patchwork [03/15] doc: Ensure man pages have up-to-date fedfs UID and GID

login
register
mail settings
Submitter Chuck Lever
Date Oct. 25, 2011, 4:48 p.m.
Message ID <20111025164835.18584.50103.stgit@seurat.1015granger.net>
Download mbox | patch
Permalink /patch/121771/
State Accepted
Headers show

Comments

Chuck Lever - Oct. 25, 2011, 4:48 p.m.
Now that the fedfs user ID is specified with a configure command line
option, we should take care to substitute the specified user ID and
group ID in the man pages, just as we do with the state dir setting.

Should have been part of commit f3522f49 "configure.ac: Add a
--with-fedfsuser and --with-statedir options" (Sep 26, 2011).

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 doc/man/Makefile.am  |    2 ++
 doc/man/nsdbparams.8 |    4 ++--
 doc/man/rpc.fedfsd.8 |    4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

Patch

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index a99ad4a..c18d5a7 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -46,8 +46,10 @@  install-data-hook:
 	(cd $(DESTDIR)$(mandir)/man7 && \
 	  for p in $(dist_man7_MANS); do \
 	    $(SED) -i 's,[@]statedir@,$(statedir),' $$p ;\
+	    $(SED) -i 's,[@]fedfsuser@,$(fedfsuser),' $$p ;\
 	  done)
 	(cd $(DESTDIR)$(mandir)/man8 && \
 	  for p in $(dist_man8_MANS); do \
 	    $(SED) -i 's,[@]statedir@,$(statedir),' $$p ;\
+	    $(SED) -i 's,[@]fedfsuser@,$(fedfsuser),' $$p ;\
 	  done)
diff --git a/doc/man/nsdbparams.8 b/doc/man/nsdbparams.8
index c99aa18..265cf54 100644
--- a/doc/man/nsdbparams.8
+++ b/doc/man/nsdbparams.8
@@ -154,7 +154,7 @@  Specifies the numeric or text GID that
 .BR rpc.fedfsd (8)
 runs under after dropping root privileges.
 By default, the GID for the group
-.I fedfs
+.I @fedfsuser@
 is used.
 If that group doesn't exist, then the GID for
 .I nobody
@@ -192,7 +192,7 @@  Specifies the numeric or text UID that
 .BR rpc.fedfsd (8)
 runs under after dropping root privileges.
 By default, the UID for the user
-.I fedfs
+.I @fedfsuser@
 is used.
 If that user doesn't exist, then the UID for
 .I nobody
diff --git a/doc/man/rpc.fedfsd.8 b/doc/man/rpc.fedfsd.8
index 1840545..2c632ab 100644
--- a/doc/man/rpc.fedfsd.8
+++ b/doc/man/rpc.fedfsd.8
@@ -86,7 +86,7 @@  Specifies the numeric or text UID that
 .BR rpc.fedfsd (8)
 runs under after dropping root privileges.
 By default, the UID for the user
-.I fedfs
+.I @fedfsuser@
 is used.
 If that user doesn't exist, then the UID for
 .I nobody
@@ -96,7 +96,7 @@  Specifies the numeric or text GID that
 .BR rpc.fedfsd (8)
 runs under after dropping root privileges.
 By default, the GID for the group
-.I fedfs
+.I @fedfsuser@
 is used.
 If that group doesn't exist, then the GID for
 .I nobody