diff options
| author | Filipe Brandenburger <filbranden@google.com> | 2015-05-27 02:38:20 -0700 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-05-28 19:28:23 +0200 |
| commit | d31dd62ba290f3f299b65f9319bf5a5436ca8622 (patch) | |
| tree | af94fc28efed1c1712b1e5a7850c8e1de1c2b0b0 | |
| parent | 681eb9cf2b831293a4f3d4c48a748d2e4a25d69e (diff) | |
man: use configured path for mount and umount binaries in manpages
Export the MOUNT_PATH and UMOUNT_PATH variables as XML entities and use them in
the systemctl.1 manpage instead of hardcoding the path in /usr/bin.
Tested:
- Ran ./configure ac_cv_path_MOUNT_PATH=/bin/mount (same for umount) and
rebuilt the manpages, confirmed that the correct path was in man/systemctl.1
- Rebuilt man/systemd.directives.xml and the man pages derived from it,
confirmed that the correct paths were there as well.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | man/systemctl.xml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index d6010c5cc2..98ceb773a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6505,6 +6505,8 @@ substitutions = \ '|DEBUGTTY=$(DEBUGTTY)|' \ '|KILL=$(KILL)|' \ '|KMOD=$(KMOD)|' \ + '|MOUNT_PATH=$(MOUNT_PATH)|' \ + '|UMOUNT_PATH=$(UMOUNT_PATH)|' \ '|MKDIR_P=$(MKDIR_P)|' \ '|QUOTAON=$(QUOTAON)|' \ '|QUOTACHECK=$(QUOTACHECK)|' \ diff --git a/man/systemctl.xml b/man/systemctl.xml index a2c8a73175..35f47de52c 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -413,8 +413,8 @@ processes. Not all unit types manage processes of these types however. For example, for mount units, control processes are defined (which are the invocations of - <filename>/usr/bin/mount</filename> and - <filename>/usr/bin/umount</filename>), but no main process + <filename>&MOUNT_PATH;</filename> and + <filename>&UMOUNT_PATH;</filename>), but no main process is defined. If omitted, defaults to <option>all</option>.</para> </listitem> |