summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/boot/meson.build15
-rw-r--r--src/pcrextend/meson.build19
-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"