diff options
| -rw-r--r-- | NEWS | 18 | ||||
| -rw-r--r-- | docs/TPM2_PCR_MEASUREMENTS.md | 6 | ||||
| -rw-r--r-- | man/systemd-stub.xml | 2 | ||||
| -rw-r--r-- | man/systemd.net-naming-scheme.xml | 2 | ||||
| -rw-r--r-- | src/boot/efi/UEFI_SECURITY.md | 4 | ||||
| -rw-r--r-- | src/boot/efi/devicetree.c | 4 | ||||
| -rw-r--r-- | src/boot/measure.c | 2 | ||||
| -rw-r--r-- | src/fundamental/tpm2-pcr.h | 2 | ||||
| -rw-r--r-- | src/hostname/hostnamed.c | 2 | ||||
| -rw-r--r-- | src/udev/udev-builtin-net_id.c | 2 |
10 files changed, 22 insertions, 22 deletions
@@ -183,7 +183,7 @@ CHANGES WITH 257 in spe: * The systemd.machine_id= kernel command line parameter interpreted by PID 1 now supports an additional special value: if "firmware" is - specified the machine ID is initialized from the SMBIOS/Devicetree + specified the machine ID is initialized from the SMBIOS/DeviceTree system UUID. (Previously this was already done in VM environments, this extends the concept to any system, but only on explicit request via this option.) @@ -273,10 +273,10 @@ CHANGES WITH 257 in spe: show up as .device units in systemd. * The firmware_node/sun sysfs attribute will now be used (if available) - for naming slot-based network interfaces, - i.e. ID_NET_NAME_SLOT. Moreover the interface aliases specified in - Devicetree are now searched for both on the interfaces parent device - (as before) and the device itself (new). + for naming slot-based network interfaces, i.e. ID_NET_NAME_SLOT. + Moreover the interface aliases specified in DeviceTree are now + searched for both on the interface's parent device (as before) and + the device itself (new). * Various USB hardware wallets have are now recognized by udev via a .hwdb file, and get the ID_HARDWARE_WALLET= property set, which @@ -2009,7 +2009,7 @@ CHANGES WITH 255: respective SBAT sections, so that they can be revoked individually if needed. - * systemd-boot will no longer load unverified Devicetree blobs when UEFI + * systemd-boot will no longer load unverified DeviceTree blobs when UEFI SecureBoot is enabled. For more details see: https://github.com/systemd/systemd/security/advisories/GHSA-6m6p-rjcq-334c @@ -2030,7 +2030,7 @@ CHANGES WITH 255: command-line addons before measuring them in TPM2 PCR 12, in a single measurement, instead of measuring them individually. - * systemd-stub will now measure and load Devicetree Blob addons, which + * systemd-stub will now measure and load DeviceTree Blob addons, which are searched and loaded following the same model as the existing kernel command-line addons. @@ -2038,7 +2038,7 @@ CHANGES WITH 255: passed from systemd-boot when running inside Confidential VMs with UEFI SecureBoot enabled. - * systemd-stub will now load a Devicetree blob even if the firmware did + * systemd-stub will now load a DeviceTree blob even if the firmware did not load any beforehand (e.g.: for ACPI systems). * ukify is no longer considered experimental, and now ships in /usr/bin/. @@ -4352,7 +4352,7 @@ CHANGES WITH 252 🎃: * 'udevadm wait' will now listen to kernel uevents too when called with --initialized=no. - * When naming network devices udev will now consult the Devicetree + * When naming network devices udev will now consult the DeviceTree "alias" fields for the device. * systemd-udev will now create infiniband/by-path and diff --git a/docs/TPM2_PCR_MEASUREMENTS.md b/docs/TPM2_PCR_MEASUREMENTS.md index daee33980b..b2c740494d 100644 --- a/docs/TPM2_PCR_MEASUREMENTS.md +++ b/docs/TPM2_PCR_MEASUREMENTS.md @@ -110,15 +110,15 @@ UTF-16. → **Measured hash** covers the literal kernel command line in UTF-16 (without any trailing NUL bytes). -### PCR 12, `EV_EVENT_TAG`, "Devicetrees" +### PCR 12, `EV_EVENT_TAG`, "DeviceTrees" -Devicetree addons are measured individually as a tagged event. +DeviceTree addons are measured individually as a tagged event. → **Event Tag** `0x6c46f751` → **Description** the addon filename. -→ **Measured hash** covers the content of the Devicetree. +→ **Measured hash** covers the content of the DeviceTree. ### PCR 12, `EV_EVENT_TAG`, "Initrd addons" diff --git a/man/systemd-stub.xml b/man/systemd-stub.xml index 8f63770997..1ba6a5bdbf 100644 --- a/man/systemd-stub.xml +++ b/man/systemd-stub.xml @@ -214,7 +214,7 @@ <listitem><para>Similarly, files <filename><replaceable>foo</replaceable>.efi.extra.d/*.addon.efi</filename> are loaded and verified as PE binaries and specific sections are loaded from them. Addons are used to pass additional kernel - command line parameters (<literal>.cmdline</literal> section), or Devicetree blobs + command line parameters (<literal>.cmdline</literal> section), or DeviceTree blobs (<literal>.dtb</literal> section), additional initrds (<literal>.initrd</literal> section), and microcode updates (<literal>.ucode</literal> section). Addons allow those resources to be passed regardless of the kernel version being booted, for example allowing platform vendors to ship diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml index b9e5cd9050..2a71a9a23f 100644 --- a/man/systemd.net-naming-scheme.xml +++ b/man/systemd.net-naming-scheme.xml @@ -123,7 +123,7 @@ <row> <entry><replaceable>prefix</replaceable><constant>d</constant><replaceable>number</replaceable></entry> - <entry>Devicetree alias index</entry> + <entry>DeviceTree alias index</entry> </row> </tbody> diff --git a/src/boot/efi/UEFI_SECURITY.md b/src/boot/efi/UEFI_SECURITY.md index 55e66dbcc9..78e9c4e16c 100644 --- a/src/boot/efi/UEFI_SECURITY.md +++ b/src/boot/efi/UEFI_SECURITY.md @@ -54,7 +54,7 @@ libraries (such as OpenSSL or gnu-efi) are linked, embedded, or used. ## Additional Resources BLS Type #1 entries allow the user to load two types of additional resources that can affect the system -before `ExitBootServices()` has been called — kernel command line arguments and Devicetree blobs — that are +before `ExitBootServices()` has been called — kernel command line arguments and DeviceTree blobs — that are not validated before use, as they do not carry signatures. For this reason, when SecureBoot is enabled, loading these resources is automatically disabled. There is no override for this security mechanism, neither at build time nor at runtime. Note that initrds are also not verified in BLS Type #1 configurations, for @@ -62,7 +62,7 @@ compatibility with how SecureBoot has been traditionally handled on Linux-based only load them after `ExitBootServices()` has been called. Another mechanism is supported by `systemd-boot` and `systemd-stub` to add additional payloads to the boot -process: "addons". Addons are PE signed binaries that can carry kernel command line arguments or Devicetree +process: "addons". Addons are PE signed binaries that can carry kernel command line arguments or DeviceTree blobs (more payload types might be added in the future). In contrast to the user-specified additions in the Type #1 case described above, these addons are loaded through the UEFI image loading protocol, and thus are subject to diff --git a/src/boot/efi/devicetree.c b/src/boot/efi/devicetree.c index f3563f296f..842b96a97d 100644 --- a/src/boot/efi/devicetree.c +++ b/src/boot/efi/devicetree.c @@ -178,8 +178,8 @@ bool firmware_devicetree_exists(void) { return !!find_configuration_table(MAKE_GUID_PTR(EFI_DTB_TABLE)); } -/* This function checks if the firmware provided Devicetree - * and a UKI provided Devicetree contain the same first entry +/* This function checks if the firmware provided DeviceTree + * and a UKI provided DeviceTree contain the same first entry * on their respective "compatible" fields (which usually defines * the actual device model). More specifically, given the FW/UKI * "compatible" property pair: diff --git a/src/boot/measure.c b/src/boot/measure.c index 9e6295b9da..ed253b79f0 100644 --- a/src/boot/measure.c +++ b/src/boot/measure.c @@ -98,7 +98,7 @@ static int help(int argc, char *argv[], void *userdata) { " --initrd=PATH Path to initrd image file %7$s .initrd\n" " --ucode=PATH Path to microcode image file %7$s .ucode\n" " --splash=PATH Path to splash bitmap file %7$s .splash\n" - " --dtb=PATH Path to Devicetree file %7$s .dtb\n" + " --dtb=PATH Path to DeviceTree file %7$s .dtb\n" " --uname=PATH Path to 'uname -r' file %7$s .uname\n" " --sbat=PATH Path to SBAT file %7$s .sbat\n" " --pcrpkey=PATH Path to public key for PCR signatures %7$s .pcrpkey\n" diff --git a/src/fundamental/tpm2-pcr.h b/src/fundamental/tpm2-pcr.h index f903ec3e3b..d8728bf88e 100644 --- a/src/fundamental/tpm2-pcr.h +++ b/src/fundamental/tpm2-pcr.h @@ -47,7 +47,7 @@ enum { /* The tag used for EV_EVENT_TAG event log records covering the boot loader config */ #define LOADER_CONF_EVENT_TAG_ID UINT32_C(0xf5bc582a) -/* The tag used for EV_EVENT_TAG event log records covering Devicetree blobs */ +/* The tag used for EV_EVENT_TAG event log records covering DeviceTree blobs */ #define DEVICETREE_ADDON_EVENT_TAG_ID UINT32_C(0x6c46f751) /* The tag used for EV_EVENT_TAG event log records covering initrd addons */ diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index d2444dbf2d..cc538ce979 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -502,7 +502,7 @@ try_devicetree: return NULL; } - /* Note that the Devicetree specification uses the very same vocabulary + /* Note that the DeviceTree specification uses the very same vocabulary * of chassis types as we do, hence we do not need to translate these types: * * https://github.com/devicetree-org/devicetree-specification/blob/master/source/chapter3-devicenodes.rst */ diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index 9e50603c63..09c04b9a7f 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -924,7 +924,7 @@ static int names_devicetree(sd_device *dev, const char *prefix, EventMode mode) char str[ALTIFNAMSIZ]; if (snprintf_ok(str, sizeof str, "%sd%u", prefix, i)) udev_builtin_add_property(dev, mode, "ID_NET_NAME_ONBOARD", str); - log_device_debug(dev, "Devicetree identifier: alias_index=%u %s \"%s\"", + log_device_debug(dev, "DeviceTree identifier: alias_index=%u %s \"%s\"", i, special_glyph(SPECIAL_GLYPH_ARROW_RIGHT), str + strlen(prefix)); return 0; } |