Skip to content

Commit bb5a34f

Browse files
keszybzkeszybz
committed
man: add conditionals to more man pages
Fixes systemd#16701.
1 parent b3259a6 commit bb5a34f

File tree

7 files changed

+14
-18
lines changed

7 files changed

+14
-18
lines changed

‎man/rules/meson.build‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ manpages = [
6363
['repart.d', '5', [], 'ENABLE_REPART'],
6464
['resolvectl', '1', ['resolvconf'], 'ENABLE_RESOLVE'],
6565
['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVE'],
66-
['runlevel', '8', [], ''],
66+
['runlevel', '8', [], 'HAVE_SYSV_COMPAT'],
6767
['sd-bus-errors',
6868
'3',
6969
['SD_BUS_ERROR_ACCESS_DENIED',
@@ -785,7 +785,7 @@ manpages = [
785785
['shutdown', '8', [], ''],
786786
['sysctl.d', '5', [], ''],
787787
['systemctl', '1', [], ''],
788-
['systemd-analyze', '1', [], ''],
788+
['systemd-analyze', '1', [], 'ENABLE_ANALYZE'],
789789
['systemd-ask-password-console.service',
790790
'8',
791791
['systemd-ask-password-console.path',
@@ -818,7 +818,7 @@ manpages = [
818818
['systemd-debug-generator', '8', [], ''],
819819
['systemd-delta', '1', [], ''],
820820
['systemd-detect-virt', '1', [], ''],
821-
['systemd-dissect', '1', [], ''],
821+
['systemd-dissect', '1', [], 'HAVE_BLKID'],
822822
['systemd-environment-d-generator',
823823
'8',
824824
['30-systemd-environment-d-generator'],
@@ -831,7 +831,7 @@ manpages = [
831831
''],
832832
['systemd-fstab-generator', '8', [], ''],
833833
['systemd-getty-generator', '8', [], ''],
834-
['systemd-gpt-auto-generator', '8', [], ''],
834+
['systemd-gpt-auto-generator', '8', [], 'HAVE_BLKID'],
835835
['systemd-halt.service',
836836
'8',
837837
['systemd-kexec.service',
@@ -912,7 +912,7 @@ manpages = [
912912
'8',
913913
['systemd-random-seed'],
914914
'ENABLE_RANDOMSEED'],
915-
['systemd-rc-local-generator', '8', [], ''],
915+
['systemd-rc-local-generator', '8', [], 'HAVE_SYSV_COMPAT'],
916916
['systemd-remount-fs.service', '8', ['systemd-remount-fs'], ''],
917917
['systemd-repart', '8', ['systemd-repart.service'], 'ENABLE_REPART'],
918918
['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVE'],
@@ -1010,7 +1010,7 @@ manpages = [
10101010
['systemd.timer', '5', [], ''],
10111011
['systemd.unit', '5', [], ''],
10121012
['sysusers.d', '5', [], 'ENABLE_SYSUSERS'],
1013-
['telinit', '8', [], ''],
1013+
['telinit', '8', [], 'HAVE_SYSV_COMPAT'],
10141014
['timedatectl', '1', [], 'ENABLE_TIMEDATECTL'],
10151015
['timesyncd.conf', '5', ['timesyncd.conf.d'], 'ENABLE_TIMESYNCD'],
10161016
['tmpfiles.d', '5', [], ''],

‎man/runlevel.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
44
<!-- SPDX-License-Identifier: LGPL-2.1+ -->
55

6-
<refentry id="runlevel"
6+
<refentry id="runlevel" conditional='HAVE_SYSV_COMPAT'
77
xmlns:xi="http://www.w3.org/2001/XInclude">
88

99
<refentryinfo>
@@ -159,5 +159,4 @@
159159
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
160160
</para>
161161
</refsect1>
162-
163162
</refentry>

‎man/systemd-analyze.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
44
<!-- SPDX-License-Identifier: LGPL-2.1+ -->
55

6-
<refentry id="systemd-analyze"
6+
<refentry id="systemd-analyze" conditional='ENABLE_ANALYZE'
77
xmlns:xi="http://www.w3.org/2001/XInclude">
88

99
<refentryinfo>

‎man/systemd-dissect.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
44
<!-- SPDX-License-Identifier: LGPL-2.1+ -->
55

6-
<refentry id="systemd-dissect"
6+
<refentry id="systemd-dissect" conditional='HAVE_BLKID'
77
xmlns:xi="http://www.w3.org/2001/XInclude">
88

99
<refentryinfo>

‎man/systemd-gpt-auto-generator.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0"?>
2-
<!--*-nxml-*-->
1+
<?xml version="1.0"?> <!--*-nxml-*-->
32
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
43
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
54
<!-- SPDX-License-Identifier: LGPL-2.1+ -->
6-
<refentry id="systemd-gpt-auto-generator">
5+
6+
<refentry id="systemd-gpt-auto-generator" conditional='HAVE_BLKID'>
77

88
<refentryinfo>
99
<title>systemd-gpt-auto-generator</title>

‎man/systemd-rc-local-generator.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
44
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
55
<!-- SPDX-License-Identifier: LGPL-2.1+ -->
6-
<refentry id="systemd-rc-local-generator">
7-
6+
<refentry id="systemd-rc-local-generator" conditional='HAVE_SYSV_COMPAT'>
87
<refentryinfo>
98
<title>systemd-rc-local-generator</title>
109
<productname>systemd</productname>
@@ -51,5 +50,4 @@
5150
<citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
5251
</para>
5352
</refsect1>
54-
5553
</refentry>

‎man/telinit.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
44
<!-- SPDX-License-Identifier: LGPL-2.1+ -->
55

6-
<refentry id="telinit"
6+
<refentry id="telinit" conditional='HAVE_SYSV_COMPAT'
77
xmlns:xi="http://www.w3.org/2001/XInclude">
88

99
<refentryinfo>
@@ -148,5 +148,4 @@
148148
<citerefentry project='man-pages'><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>
149149
</para>
150150
</refsect1>
151-
152151
</refentry>

0 commit comments

Comments
 (0)