diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-08-20 17:41:19 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-08-26 14:35:32 +0200 |
commit | ea94f218be3ede34b7020649dc5e243497b4a9ae (patch) | |
tree | 6b31cb699ebbef00b2d8593ae2622a2f82d3f9df | |
parent | ef913253494f28fb0708fb072415fb59a1924491 (diff) | |
download | systemd-ea94f218be3ede34b7020649dc5e243497b4a9ae.tar.gz |
man: add conditionals to more man pages
Fixes #16701.
(cherry picked from commit bb5a34fb3eeef824afe02b679d391853244161b1)
-rw-r--r-- | man/rules/meson.build | 10 | ||||
-rw-r--r-- | man/runlevel.xml | 3 | ||||
-rw-r--r-- | man/systemd-analyze.xml | 2 | ||||
-rw-r--r-- | man/systemd-gpt-auto-generator.xml | 6 | ||||
-rw-r--r-- | man/systemd-rc-local-generator.xml | 4 | ||||
-rw-r--r-- | man/telinit.xml | 3 |
6 files changed, 12 insertions, 16 deletions
diff --git a/man/rules/meson.build b/man/rules/meson.build index 3fb454faa9..e889c8d1aa 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -63,7 +63,7 @@ manpages = [ ['repart.d', '5', [], 'ENABLE_REPART'], ['resolvectl', '1', ['resolvconf'], 'ENABLE_RESOLVE'], ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVE'], - ['runlevel', '8', [], ''], + ['runlevel', '8', [], 'HAVE_SYSV_COMPAT'], ['sd-bus-errors', '3', ['SD_BUS_ERROR_ACCESS_DENIED', @@ -785,7 +785,7 @@ manpages = [ ['shutdown', '8', [], ''], ['sysctl.d', '5', [], ''], ['systemctl', '1', [], ''], - ['systemd-analyze', '1', [], ''], + ['systemd-analyze', '1', [], 'ENABLE_ANALYZE'], ['systemd-ask-password-console.service', '8', ['systemd-ask-password-console.path', @@ -830,7 +830,7 @@ manpages = [ ''], ['systemd-fstab-generator', '8', [], ''], ['systemd-getty-generator', '8', [], ''], - ['systemd-gpt-auto-generator', '8', [], ''], + ['systemd-gpt-auto-generator', '8', [], 'HAVE_BLKID'], ['systemd-halt.service', '8', ['systemd-kexec.service', @@ -911,7 +911,7 @@ manpages = [ '8', ['systemd-random-seed'], 'ENABLE_RANDOMSEED'], - ['systemd-rc-local-generator', '8', [], ''], + ['systemd-rc-local-generator', '8', [], 'HAVE_SYSV_COMPAT'], ['systemd-remount-fs.service', '8', ['systemd-remount-fs'], ''], ['systemd-repart', '8', ['systemd-repart.service'], 'ENABLE_REPART'], ['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVE'], @@ -1009,7 +1009,7 @@ manpages = [ ['systemd.timer', '5', [], ''], ['systemd.unit', '5', [], ''], ['sysusers.d', '5', [], 'ENABLE_SYSUSERS'], - ['telinit', '8', [], ''], + ['telinit', '8', [], 'HAVE_SYSV_COMPAT'], ['timedatectl', '1', [], 'ENABLE_TIMEDATECTL'], ['timesyncd.conf', '5', ['timesyncd.conf.d'], 'ENABLE_TIMESYNCD'], ['tmpfiles.d', '5', [], ''], diff --git a/man/runlevel.xml b/man/runlevel.xml index 87e2ed234a..75a572cb00 100644 --- a/man/runlevel.xml +++ b/man/runlevel.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- SPDX-License-Identifier: LGPL-2.1+ --> -<refentry id="runlevel" +<refentry id="runlevel" conditional='HAVE_SYSV_COMPAT' xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> @@ -159,5 +159,4 @@ <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> </para> </refsect1> - </refentry> diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml index 3d6de1710d..4da5b4c3f8 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- SPDX-License-Identifier: LGPL-2.1+ --> -<refentry id="systemd-analyze" +<refentry id="systemd-analyze" conditional='ENABLE_ANALYZE' xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index 78fdacccab..7476edcffc 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -1,9 +1,9 @@ -<?xml version="1.0"?> -<!--*-nxml-*--> +<?xml version="1.0"?> <!--*-nxml-*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- SPDX-License-Identifier: LGPL-2.1+ --> -<refentry id="systemd-gpt-auto-generator"> + +<refentry id="systemd-gpt-auto-generator" conditional='HAVE_BLKID'> <refentryinfo> <title>systemd-gpt-auto-generator</title> diff --git a/man/systemd-rc-local-generator.xml b/man/systemd-rc-local-generator.xml index 81744c2025..0e607d0bce 100644 --- a/man/systemd-rc-local-generator.xml +++ b/man/systemd-rc-local-generator.xml @@ -3,8 +3,7 @@ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- SPDX-License-Identifier: LGPL-2.1+ --> -<refentry id="systemd-rc-local-generator"> - +<refentry id="systemd-rc-local-generator" conditional='HAVE_SYSV_COMPAT'> <refentryinfo> <title>systemd-rc-local-generator</title> <productname>systemd</productname> @@ -51,5 +50,4 @@ <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> </para> </refsect1> - </refentry> diff --git a/man/telinit.xml b/man/telinit.xml index 43871eb351..0fffd51093 100644 --- a/man/telinit.xml +++ b/man/telinit.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- SPDX-License-Identifier: LGPL-2.1+ --> -<refentry id="telinit" +<refentry id="telinit" conditional='HAVE_SYSV_COMPAT' xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> @@ -148,5 +148,4 @@ <citerefentry project='man-pages'><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry> </para> </refsect1> - </refentry> |