picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

man: use configured path for mount and umount binaries in manpages

Browse source 
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.
This commit is contained in:
Filipe Brandenburger 2015-05-27 02:38:20 -07:00 committed by Lennart Poettering
parent 681eb9cf2b
commit d31dd62ba2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -6505,6 +6505,8 @@ substitutions = \
'|DEBUGTTY=$(DEBUGTTY)|' \ '|DEBUGTTY=$(DEBUGTTY)|' \
'|KILL=$(KILL)|' \ '|KILL=$(KILL)|' \
'|KMOD=$(KMOD)|' \ '|KMOD=$(KMOD)|' \
'|MOUNT_PATH=$(MOUNT_PATH)|' \
'|UMOUNT_PATH=$(UMOUNT_PATH)|' \
'|MKDIR_P=$(MKDIR_P)|' \ '|MKDIR_P=$(MKDIR_P)|' \
'|QUOTAON=$(QUOTAON)|' \ '|QUOTAON=$(QUOTAON)|' \
'|QUOTACHECK=$(QUOTACHECK)|' \ '|QUOTACHECK=$(QUOTACHECK)|' \

4
man/systemctl.xml
View file

@ -413,8 +413,8 @@
processes. Not all unit types manage processes of these processes. Not all unit types manage processes of these
types however. For example, for mount units, control processes types however. For example, for mount units, control processes
are defined (which are the invocations of are defined (which are the invocations of
<filename>/usr/bin/mount</filename> and <filename>&MOUNT_PATH;</filename> and
<filename>/usr/bin/umount</filename>), but no main process <filename>&UMOUNT_PATH;</filename>), but no main process
is defined. If omitted, defaults to is defined. If omitted, defaults to
<option>all</option>.</para> <option>all</option>.</para>
</listitem> </listitem>