diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/boot/efi/measure.h | 2 | ||||
| -rw-r--r-- | src/cryptsetup/cryptsetup.c | 2 | ||||
| -rw-r--r-- | src/home/homed-home.c | 2 | ||||
| -rw-r--r-- | src/nspawn/nspawn-cgroup.c | 2 | ||||
| -rw-r--r-- | src/nspawn/nspawn-oci.c | 4 | ||||
| -rw-r--r-- | src/shared/netif-naming-scheme.c | 2 | ||||
| -rw-r--r-- | src/udev/udevd.c | 2 | ||||
| -rwxr-xr-x | test/networkd-test.py | 2 |
9 files changed, 10 insertions, 10 deletions
@@ -38,7 +38,7 @@ CHANGES WITH 251: image" environments, where the machine ID shall be initialized on first boot (as opposed to at installation time before first boot) the machine ID is not be available at build time to name the entry - after. In this case the the --entry-token= switch to bootctl (or the + after. In this case the --entry-token= switch to bootctl (or the /etc/kernel/entry-token file) may be used to override the "token" to identify the entry by, and use another ID, for example the IMAGE_ID= or ID= fields from /etc/os-release. This will make the OS images diff --git a/src/boot/efi/measure.h b/src/boot/efi/measure.h index 7a817b22d8..e951ff7ef0 100644 --- a/src/boot/efi/measure.h +++ b/src/boot/efi/measure.h @@ -6,7 +6,7 @@ /* This TPM PCR is where we extend the kernel command line and any passed credentials here. */ #define TPM_PCR_INDEX_KERNEL_PARAMETERS 12U -/* We used to write the the kernel command line/credentials into PCR 8, in systemd <= 250. Let's provide for +/* We used to write the kernel command line/credentials into PCR 8, in systemd <= 250. Let's provide for * some compatibility. (Remove in 2023!) */ #if EFI_TPM_PCR_COMPAT #define TPM_PCR_INDEX_KERNEL_PARAMETERS_COMPAT 8U diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index c2075f53fd..f2b0269fc5 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -1186,7 +1186,7 @@ static int attach_luks_or_plain_or_bitlk_by_pkcs11( /* Before using this key as passphrase we base64 encode it. Why? For compatibility * with homed's PKCS#11 hookup: there we want to use the key we acquired through * PKCS#11 for other authentication/decryption mechanisms too, and some of them do - * not not take arbitrary binary blobs, but require NUL-terminated strings — most + * not take arbitrary binary blobs, but require NUL-terminated strings — most * importantly UNIX password hashes. Hence, for compatibility we want to use a string * without embedded NUL here too, and that's easiest to generate from a binary blob * via base64 encoding. */ diff --git a/src/home/homed-home.c b/src/home/homed-home.c index 1340cf30d3..79c568917a 100644 --- a/src/home/homed-home.c +++ b/src/home/homed-home.c @@ -1452,7 +1452,7 @@ static int home_deactivate_internal(Home *h, bool force, sd_bus_error *error) { } /* Let's start a timer to retry deactivation in 15. We'll stop the timer once we manage to deactivate - * the home directory again, or we we start any other operation. */ + * the home directory again, or we start any other operation. */ home_start_retry_deactivate(h); return r; diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c index d472e80c03..af00119c21 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c @@ -154,7 +154,7 @@ int create_subcgroup(pid_t pid, bool keep_unit, CGroupUnified unified_requested) * the unified hierarchy and the container does the same, and we did not create a scope unit for the container * move us and the container into two separate subcgroups. * - * Moreover, container payloads such as systemd try to manage the cgroup they run in in full (i.e. including + * Moreover, container payloads such as systemd try to manage the cgroup they run in full (i.e. including * its attributes), while the host systemd will only delegate cgroups for children of the cgroup created for a * delegation unit, instead of the cgroup itself. This means, if we'd pass on the cgroup allocated from the * host systemd directly to the payload, the host and payload systemd might fight for the cgroup diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c index 9e59d6a814..a23358464b 100644 --- a/src/nspawn/nspawn-oci.c +++ b/src/nspawn/nspawn-oci.c @@ -2006,7 +2006,7 @@ static int oci_masked_paths(const char *name, JsonVariant *v, JsonDispatchFlags if (!path_is_absolute(p)) return json_log(v, flags, SYNTHETIC_ERRNO(EINVAL), - "Path is not not absolute, refusing: %s", p); + "Path is not absolute, refusing: %s", p); if (oci_exclude_mount(p)) continue; @@ -2048,7 +2048,7 @@ static int oci_readonly_paths(const char *name, JsonVariant *v, JsonDispatchFlag if (!path_is_absolute(p)) return json_log(v, flags, SYNTHETIC_ERRNO(EINVAL), - "Path is not not absolute, refusing: %s", p); + "Path is not absolute, refusing: %s", p); if (oci_exclude_mount(p)) continue; diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c index 245466c4cb..a2bc4fa55a 100644 --- a/src/shared/netif-naming-scheme.c +++ b/src/shared/netif-naming-scheme.c @@ -29,7 +29,7 @@ static const NamingScheme naming_schemes[] = { }; const NamingScheme* naming_scheme_from_name(const char *name) { - /* "latest" may either be defined explicitly by the extra map, in which case we we will find it in + /* "latest" may either be defined explicitly by the extra map, in which case we will find it in * the table like any other name. After iterating through the table, we check for "latest" again, * which means that if not mapped explicitly, it maps to the last defined entry, whatever that is. */ diff --git a/src/udev/udevd.c b/src/udev/udevd.c index c6f6d945c8..6137d805f4 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -497,7 +497,7 @@ static int worker_process_device(Manager *manager, sd_device *dev) { * supposed to be enabled via an option set via udev rules (OPTIONS+="watch"). If we skip the * udev rules here however (as we just said we do), we would thus never see that specific * udev rule, and thus never turn on inotify watching. But in order to catch up eventually - * and run them we we need the inotify watching: hence a classic chicken and egg problem. + * and run them we need the inotify watching: hence a classic chicken and egg problem. * * Our way out here: if we see the block device locked, unconditionally watch the device via * inotify, regardless of any explicit request via OPTIONS+="watch". Thus, a device that is diff --git a/test/networkd-test.py b/test/networkd-test.py index b3ef7bc5da..7faa12ef79 100755 --- a/test/networkd-test.py +++ b/test/networkd-test.py @@ -138,7 +138,7 @@ class NetworkdTestingUtilities: def read_attr(self, link, attribute): """Read a link attributed from the sysfs.""" - # Note we we don't want to check if interface `link' is managed, we + # Note we don't want to check if interface `link' is managed, we # want to evaluate link variable and pass the value of the link to # assert_link_states e.g. eth0=managed. self.assert_link_states(**{link:'managed'}) |