From 8c2b6cb2d6ecee4d7d39bdbf04b9cadd18908238 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 4 May 2016 11:00:50 -0400 Subject: [PATCH] doc/man: use configured directories in man pages MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- doc/man/Makefile.am | 4 +++- doc/man/common-cmd-footer.txt | 2 +- doc/man/lttng-sessiond.8.txt | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index bebfb1fb8..3cd3effc6 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -77,7 +77,9 @@ if MAN_PAGES_OPT if HAVE_ASCIIDOC_XMLTO # tools ADOC = $(ASCIIDOC) -f $(ASCIIDOC_CONF) -d manpage \ - -a lttng_version="$(PACKAGE_VERSION)" + -a lttng_version="$(PACKAGE_VERSION)" \ + -a system_sessions_dir="$(sysconfdir)/lttng/sessions" \ + -a system_lttng_conf="$(sysconfdir)/lttng/lttng.conf" ADOC_DOCBOOK = $(ADOC) -b docbook XTO = $(XMLTO) -m $(firstword $(XSL_SRC_FILES)) man diff --git a/doc/man/common-cmd-footer.txt b/doc/man/common-cmd-footer.txt index 329cca618..d776cc4a4 100644 --- a/doc/man/common-cmd-footer.txt +++ b/doc/man/common-cmd-footer.txt @@ -47,7 +47,7 @@ more information about tracing sessions. Default location of saved user tracing sessions (see man:lttng-save(1) and man:lttng-load(1)). -`/etc/lttng/sessions`:: ++{system_sessions_dir}+:: System-wide location of saved tracing sessions (see man:lttng-save(1) and man:lttng-load(1)). diff --git a/doc/man/lttng-sessiond.8.txt b/doc/man/lttng-sessiond.8.txt index 130a477b0..76f9dab12 100644 --- a/doc/man/lttng-sessiond.8.txt +++ b/doc/man/lttng-sessiond.8.txt @@ -65,7 +65,7 @@ Loading tracing session configurations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ By default, the LTTng session daemon tries to load tracing session configurations located in the user default directory -`$HOME/.lttng/sessions` and in the system one, `/etc/lttng/sessions`. +`$HOME/.lttng/sessions` and in the system one, +{system_sessions_dir}+. Note that both the directory containing the tracing session configurations and the session daemon binary _must_ have the same UID for the configurations to be automatically loaded. @@ -275,7 +275,7 @@ FILES Default location of saved user tracing sessions (see man:lttng-save(1) and man:lttng-load(1)). -`/etc/lttng/sessions`:: ++{system_sessions_dir}+:: System-wide location of saved tracing sessions (see man:lttng-save(1) and man:lttng-load(1)). @@ -283,7 +283,7 @@ FILES Default location of the session daemon configuration file (see the option:--config option). -`/etc/lttng/lttng.conf`:: ++{system_lttng_conf}+:: System-wide location of the session daemon configuration file (see the option:--config option). -- 2.34.1