diff options
| author | Luca Boccassi <bluca@debian.org> | 2023-12-22 21:58:04 +0100 |
|---|---|---|
| committer | Mike Yuan <me@yhndnzj.com> | 2023-12-23 11:04:08 +0100 |
| commit | d45ca9a9051d396dc8bf484072b10bec21ad2e3e (patch) | |
| tree | c93c8b39b21ac985c6d33e97c61fdf8f8c77fef2 /man | |
| parent | udev: use SD_EVENT_SIGNAL_PROCMASK (diff) | |
| download | systemd-d45ca9a9051d396dc8bf484072b10bec21ad2e3e.tar.xz systemd-d45ca9a9051d396dc8bf484072b10bec21ad2e3e.zip | |
man: conditionalize sd-pcrlock and sd-measure on the same variable as their binaries
The binaries are built and installed if HAVE_TPM2 is set, and ignore ENABLE_BOOTLOADER,
so do the same for the manpages.
For the sd-pcrlock case this also installs the manpage aliases for the units, which
are not installed with -Dbootloader=disabled, but there's no way to conditionalize
the aliases, so on balance it's better to have too much documentation rather than
too little.
Fixes https://github.com/systemd/systemd/issues/30588
Diffstat (limited to 'man')
| -rw-r--r-- | man/rules/meson.build | 4 | ||||
| -rw-r--r-- | man/systemd-measure.xml | 2 | ||||
| -rw-r--r-- | man/systemd-pcrlock.xml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/man/rules/meson.build b/man/rules/meson.build index 622921f8d6..e99b77eb50 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -991,7 +991,7 @@ manpages = [ 'systemd-makefs', 'systemd-mkswap@.service'], ''], - ['systemd-measure', '1', [], 'ENABLE_BOOTLOADER'], + ['systemd-measure', '1', [], 'HAVE_TPM2'], ['systemd-modules-load.service', '8', ['systemd-modules-load'], 'HAVE_KMOD'], ['systemd-mount', '1', ['systemd-umount'], ''], ['systemd-network-generator.service', '8', ['systemd-network-generator'], ''], @@ -1013,7 +1013,7 @@ manpages = [ 'systemd-pcrlock-make-policy.service', 'systemd-pcrlock-secureboot-authority.service', 'systemd-pcrlock-secureboot-policy.service'], - 'ENABLE_BOOTLOADER'], + 'HAVE_TPM2'], ['systemd-pcrphase.service', '8', ['systemd-pcrextend', diff --git a/man/systemd-measure.xml b/man/systemd-measure.xml index ff3abc429f..b88ea9c5ed 100644 --- a/man/systemd-measure.xml +++ b/man/systemd-measure.xml @@ -3,7 +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-or-later --> -<refentry id="systemd-measure" xmlns:xi="http://www.w3.org/2001/XInclude" conditional='ENABLE_BOOTLOADER'> +<refentry id="systemd-measure" xmlns:xi="http://www.w3.org/2001/XInclude" conditional='HAVE_TPM2'> <refentryinfo> <title>systemd-measure</title> diff --git a/man/systemd-pcrlock.xml b/man/systemd-pcrlock.xml index f82268c675..30c4dae7e3 100644 --- a/man/systemd-pcrlock.xml +++ b/man/systemd-pcrlock.xml @@ -3,7 +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-or-later --> -<refentry id="systemd-pcrlock" xmlns:xi="http://www.w3.org/2001/XInclude" conditional='ENABLE_BOOTLOADER'> +<refentry id="systemd-pcrlock" xmlns:xi="http://www.w3.org/2001/XInclude" conditional='HAVE_TPM2'> <refentryinfo> <title>systemd-pcrlock</title> |