diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-09-25 10:38:01 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-09-25 17:17:20 +0200 |
| commit | 32295fa08f35d8c0b86c5faa03d7c818d3a9353f (patch) | |
| tree | d3699903066a58b1a9b8640a89c617e37b210db9 /src | |
| parent | test: enable debug logs for the user instances as well (diff) | |
| download | systemd-32295fa08f35d8c0b86c5faa03d7c818d3a9353f.tar.xz systemd-32295fa08f35d8c0b86c5faa03d7c818d3a9353f.zip | |
pcrphase: rename binary to pcrextend
The tool initially just measured the boot phase, but was subsequently
extended to measure file system and machine IDs, too. At AllSystemsGo
there were request to add more, and make the tool generically
accessible.
Hence, let's rename the binary (but not the pcrphase services), to make
clear the tool is not just measureing the boot phase, but a lot of other
things too.
The tool is located in /usr/lib/ and still relatively new, hence let's
just rename the binary and be done with it, while keeping the unit names
stable.
While we are at it, also move the tool out of src/boot/ and into its own
src/pcrextend/ dir, since it's not really doing boot related stuff
anymore.
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot/meson.build | 15 | ||||
| -rw-r--r-- | src/pcrextend/meson.build | 19 | ||||
| -rw-r--r-- | src/pcrextend/pcrextend.c (renamed from src/boot/pcrphase.c) | 4 |
3 files changed, 21 insertions, 17 deletions
diff --git a/src/boot/meson.build b/src/boot/meson.build index fdccb2a428..43ff3a5982 100644 --- a/src/boot/meson.build +++ b/src/boot/meson.build @@ -65,21 +65,6 @@ executables += [ 'dependencies' : libopenssl, }, libexec_template + { - 'name' : 'systemd-pcrphase', - 'conditions' : [ - 'HAVE_BLKID', - 'ENABLE_BOOTLOADER', - 'HAVE_OPENSSL', - 'HAVE_TPM2', - ], - 'sources' : files('pcrphase.c'), - 'dependencies' : [ - libblkid, - libopenssl, - tpm2, - ], - }, - libexec_template + { 'name' : 'systemd-boot-check-no-failures', 'sources' : files('boot-check-no-failures.c'), }, diff --git a/src/pcrextend/meson.build b/src/pcrextend/meson.build new file mode 100644 index 0000000000..05c5350806 --- /dev/null +++ b/src/pcrextend/meson.build @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +executables += [ + libexec_template + { + 'name' : 'systemd-pcrextend', + 'conditions' : [ + 'HAVE_BLKID', + 'ENABLE_BOOTLOADER', + 'HAVE_OPENSSL', + 'HAVE_TPM2', + ], + 'sources' : files('pcrextend.c'), + 'dependencies' : [ + libblkid, + libopenssl, + tpm2, + ], + }, +] diff --git a/src/boot/pcrphase.c b/src/pcrextend/pcrextend.c index 8e57c827a7..74021374d3 100644 --- a/src/boot/pcrphase.c +++ b/src/pcrextend/pcrextend.c @@ -35,14 +35,14 @@ static int help(int argc, char *argv[], void *userdata) { _cleanup_free_ char *link = NULL; int r; - r = terminal_urlify_man("systemd-pcrphase", "8", &link); + r = terminal_urlify_man("systemd-pcrextend", "8", &link); if (r < 0) return log_oom(); printf("%1$s [OPTIONS...] WORD\n" "%1$s [OPTIONS...] --file-system=PATH\n" "%1$s [OPTIONS...] --machine-id\n" - "\n%5$sMeasure boot phase into TPM2 PCR 11.%6$s\n" + "\n%5$sExtend a TPM2 PCR with boot phase, machine ID, or file system ID.%6$s\n" "\n%3$sOptions:%4$s\n" " -h --help Show this help\n" " --version Print version\n" |