summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2023-11-04 03:58:12 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2023-11-04 03:58:12 +0100
commite423b40d3588be944215f1248cfdb4e9aaa3e60f (patch)
tree7e1bdbe0cf30087e31166fb071a758933112d80a
parenttest: wait for the nvme device to appear (diff)
downloadsystemd-e423b40d3588be944215f1248cfdb4e9aaa3e60f.tar.xz
systemd-e423b40d3588be944215f1248cfdb4e9aaa3e60f.zip
tree-wide: fix typo
-rw-r--r--NEWS2
-rw-r--r--man/systemd-vmspawn.xml2
-rw-r--r--man/systemd.pcrlock.xml6
-rw-r--r--src/pcrlock/pcrlock.c4
-rw-r--r--src/shared/tpm2-util.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index 7dd063be0e..353d82caee 100644
--- a/NEWS
+++ b/NEWS
@@ -510,7 +510,7 @@ CHANGES WITH 255 in spe:
different from the existing sd_device_enumerator_add_match_property()
matches of which one one needs to apply.
- * The MAC adress the veth side of an nspawn container shall get
+ * The MAC address the veth side of an nspawn container shall get
assigned may now be controlled via the $SYSTEMD_NSPAWN_NETWORK_MAC
environment variable.
diff --git a/man/systemd-vmspawn.xml b/man/systemd-vmspawn.xml
index 2b9407be85..be5b443619 100644
--- a/man/systemd-vmspawn.xml
+++ b/man/systemd-vmspawn.xml
@@ -147,7 +147,7 @@
<refsect1>
<title>Exit status</title>
- <para>If an error occured the value errno is propagated to the return code.
+ <para>If an error occurred the value errno is propagated to the return code.
Otherwise EXIT_SUCCESS is returned.</para>
</refsect1>
diff --git a/man/systemd.pcrlock.xml b/man/systemd.pcrlock.xml
index 070bed2e11..5687db5021 100644
--- a/man/systemd.pcrlock.xml
+++ b/man/systemd.pcrlock.xml
@@ -47,9 +47,9 @@
and <literal>content_type</literal> record fields are not used and ignored if present. Each pcrlock file
defines one set of expected, ordered PCR measurements of a specific component of the boot.</para>
- <para>*.pcrlock files may be placed in various <filename>.d/</filename> drop-in directores (see above for
- a full list). All matching files discovered in these directories are sorted alphabetically by their file
- name (without taking the actual directory they were found in into account): pcrlock files with
+ <para>*.pcrlock files may be placed in various <filename>.d/</filename> drop-in directories (see above
+ for a full list). All matching files discovered in these directories are sorted alphabetically by their
+ file name (without taking the actual directory they were found in into account): pcrlock files with
alphabetically earlier names are expected to cover measurements done before those with alphabetically
later names. In order to make positioning pcrlock files in the boot process convenient the files are
expected (by convention, this is not enforced) to be named
diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c
index cd2a6a6071..a2caf0cbe6 100644
--- a/src/pcrlock/pcrlock.c
+++ b/src/pcrlock/pcrlock.c
@@ -2960,7 +2960,7 @@ static int event_log_ensure_secureboot_consistency(EventLog *el) {
records[found] = rec;
}
- /* Check for existance */
+ /* Check for existence */
for (size_t i = 0; i < ELEMENTSOF(table); i++)
if (table[i].required && !records[i])
return log_error_errno(SYNTHETIC_ERRNO(EBADMSG), "Required record '%s' not found, refusing.", table[i].name);
@@ -3658,7 +3658,7 @@ static int verb_lock_uki(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to append JSON record array: %m");
- /* And then apppend a record for the section contents digests as well */
+ /* And then append a record for the section contents digests as well */
r = json_variant_append_arrayb(
&array,
JSON_BUILD_OBJECT(
diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
index 70879a0220..d2fec4311b 100644
--- a/src/shared/tpm2-util.c
+++ b/src/shared/tpm2-util.c
@@ -5729,7 +5729,7 @@ int tpm2_calculate_policy_super_pcr(
assert_se(prediction);
assert_se(pcr_policy);
- /* Start with a zero policy if not specified otheriwse */
+ /* Start with a zero policy if not specified otherwise. */
TPM2B_DIGEST super_pcr_policy_digest = *pcr_policy;
/* First we look for all PCRs that have exactly one allowed hash value, and generate a single PolicyPCR policy from them */