]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
man: use configured path for mount and umount binaries in manpages
authorFilipe Brandenburger <filbranden@google.com>
Wed, 27 May 2015 09:38:20 +0000 (02:38 -0700)
committerLennart Poettering <lennart@poettering.net>
Thu, 28 May 2015 17:28:23 +0000 (19:28 +0200)
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.

Makefile.am
man/systemctl.xml

index d6010c5cc24afbee2b9516967b6836e91456bad5..98ceb773a8a3615be945b7af7244ab93e10219c1 100644 (file)
@@ -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)|' \
index a2c8a731754d2a876838810fb41ea561eb5914da..35f47de52c64c143aa81f454da42ce1a4187f004 100644 (file)
           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>