From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Wed, 20 Oct 2021 07:38:57 +0000 (+0200) Subject: Typos found by codespell X-Git-Tag: v250-rc1~467 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba669952b2b706833ce00d1d1eb26ddc4118b578;p=thirdparty%2Fsystemd.git Typos found by codespell --- diff --git a/docs/ENVIRONMENT.md b/docs/ENVIRONMENT.md index 9a824820dab..502266a49b5 100644 --- a/docs/ENVIRONMENT.md +++ b/docs/ENVIRONMENT.md @@ -366,7 +366,7 @@ disk images with `--image=` or similar: to validate the signature of the Verity root hash if available. If enabled (which is the default), the signature of suitable disk images is validated against any of the certificates in `/etc/verity.d/*.crt` (and similar - directores in `/usr/lib/`, `/run`, …) or passed to the kernel for validation + directories in `/usr/lib/`, `/run`, …) or passed to the kernel for validation against its built-in certificates. * `$SYSTEMD_LOOP_DIRECT_IO` – takes a boolean, which controls whether to enable diff --git a/docs/PORTABLE_SERVICES.md b/docs/PORTABLE_SERVICES.md index 6091174ea02..df6eb9958e0 100644 --- a/docs/PORTABLE_SERVICES.md +++ b/docs/PORTABLE_SERVICES.md @@ -21,7 +21,7 @@ and they are managed by the `systemd-portabled` service. Portable services don't bring anything inherently new to the table. All they do is put together known concepts to cover a specific set of use-cases in a -sligtly nicer way. +slightly nicer way. ## So, what *is* a "Portable Service"? diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb index 53342250e11..317c9854aa5 100644 --- a/hwdb.d/60-keyboard.hwdb +++ b/hwdb.d/60-keyboard.hwdb @@ -105,7 +105,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pn*:* evdev:atkbd:dmi:bvn*:bvr*:bd*:svnGateway*:pnA0A1*:* evdev:atkbd:dmi:bvn*:bvr*:bd*:svneMachines:pneMachines*E725:* - KEYBOARD_KEY_86=wlan # Fn+F3 or Fn+Q for comunication key + KEYBOARD_KEY_86=wlan # Fn+F3 or Fn+Q for communication key KEYBOARD_KEY_a5=help # Fn+F1 KEYBOARD_KEY_a6=setup # Fn+F2 Acer eSettings KEYBOARD_KEY_a7=battery # Fn+F3 Power Management @@ -195,7 +195,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnAOA*:* # Packard Bell and Gateway models evdev:atkbd:dmi:bvn*:bvr*:bd*:svnGateway*:pn*:* evdev:atkbd:dmi:bvn*:bvr*:bd*:svnPackard*Bell*:pn*:* - KEYBOARD_KEY_86=wlan # Fn+F3 or Fn+Q for comunication key + KEYBOARD_KEY_86=wlan # Fn+F3 or Fn+Q for communication key ########################################################### # Alienware @@ -1496,7 +1496,7 @@ evdev:input:b0003v047FpC006* # If you're using an us layout keyboard in one of the below models of # Purism Librem 13 consider copying this file to /etc/systemd/hwdb.d/ -# to enable the following rule acording to your model. +# to enable the following rule according to your model. # # There's a bug in the keyboards firmware and the additional rule # will make your keyboard behave as expected. diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index 2093edd05c7..5f2643a290d 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -386,7 +386,7 @@ systemd.default_timeout_start_sec= - Overrrides the default start job timeout DefaultTimeoutStartSec= at + Overrides the default start job timeout DefaultTimeoutStartSec= at boot. For details, see systemd-system.conf5. @@ -396,7 +396,7 @@ systemd.watchdog_device= - Overrrides the watchdog device path WatchdogDevice=. For details, see + Overrides the watchdog device path WatchdogDevice=. For details, see systemd-system.conf5. @@ -405,7 +405,7 @@ systemd.watchdog_sec= - Overrrides the watchdog timeout settings otherwise configured with + Overrides the watchdog timeout settings otherwise configured with RuntimeWatchdog=, RebootWatchdog= and KExecWatchdogSec=. Takes a time value (if no unit is specified, seconds is the implicitly assumed time unit) or the special strings off or diff --git a/man/networkctl.xml b/man/networkctl.xml index 2f7e9d7f468..23cd048de53 100644 --- a/man/networkctl.xml +++ b/man/networkctl.xml @@ -54,7 +54,7 @@ - Show a list of existing links and their status. If one ore more + Show a list of existing links and their status. If one or more PATTERNs are specified, only links matching one of them are shown. If no further arguments are specified shows all links, otherwise just the specified links. Produces output similar to: @@ -179,7 +179,7 @@ Show information about the specified links: type, state, kernel module driver, hardware and - IP address, configured DNS servers, etc. If one ore more PATTERNs are + IP address, configured DNS servers, etc. If one or more PATTERNs are specified, only links matching one of them are shown. When no links are specified, an overall network status is shown. Also see the option diff --git a/man/systemd-sysusers.xml b/man/systemd-sysusers.xml index e0a89b07122..cee8e6ef54e 100644 --- a/man/systemd-sysusers.xml +++ b/man/systemd-sysusers.xml @@ -83,7 +83,7 @@ - When this option is given, one ore more positional arguments + When this option is given, one or more positional arguments must be specified. All configuration files found in the directories listed in sysusers.d5 will be read, and the configuration given on the command line will be diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml index 15bc1ea889b..425ed23dd35 100644 --- a/man/systemd-tmpfiles.xml +++ b/man/systemd-tmpfiles.xml @@ -202,7 +202,7 @@ - When this option is given, one ore more positional arguments + When this option is given, one or more positional arguments must be specified. All configuration files found in the directories listed in tmpfiles.d5 will be read, and the configuration given on the command line will be diff --git a/src/basic/dirent-util.c b/src/basic/dirent-util.c index d578e6836d6..2eea228c20a 100644 --- a/src/basic/dirent-util.c +++ b/src/basic/dirent-util.c @@ -88,7 +88,7 @@ struct dirent *readdir_ensure_type(DIR *d) { return NULL; } - /* Vanished by now? Then skip immedately to next */ + /* Vanished by now? Then skip immediately to next */ } } diff --git a/src/basic/fileio.c b/src/basic/fileio.c index 09c72830c26..8d92da327ee 100644 --- a/src/basic/fileio.c +++ b/src/basic/fileio.c @@ -166,7 +166,7 @@ int write_string_stream_ts( * it won't be equal to the new value. */ if (read_virtual_file_fd(fd, strlen(line)+1, &t, NULL) > 0 && streq_skip_trailing_chars(line, t, NEWLINE)) { - log_debug("No change in value '%s', supressing write", line); + log_debug("No change in value '%s', suppressing write", line); return 0; } diff --git a/src/basic/hmac.h b/src/basic/hmac.h index 12b594c09b2..a5682c439fe 100644 --- a/src/basic/hmac.h +++ b/src/basic/hmac.h @@ -8,5 +8,5 @@ /* Unoptimized implementation based on FIPS 198. 'res' has to be allocated by * the caller. Prefer external OpenSSL functions, and use this only when - * linking to OpenSSL is not desireable (eg: libsystemd.so). */ + * linking to OpenSSL is not desirable (eg: libsystemd.so). */ void hmac_sha256(const void *key, size_t key_size, const void *input, size_t input_size, uint8_t res[static SHA256_DIGEST_SIZE]); diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c index 309e9211854..86018c8d29c 100644 --- a/src/basic/recurse-dir.c +++ b/src/basic/recurse-dir.c @@ -42,7 +42,7 @@ int readdir_all(int dir_fd, * array with readdir_all_freep(). */ /* Only if 64bit off_t is enabled struct dirent + struct dirent64 are actually the same. We require - * this, and we want them to be interchangable, hence verify that. */ + * this, and we want them to be interchangeable, hence verify that. */ assert_cc(_FILE_OFFSET_BITS == 64); assert_cc(sizeof(struct dirent) == sizeof(struct dirent64)); assert_cc(offsetof(struct dirent, d_ino) == offsetof(struct dirent64, d_ino)); @@ -273,7 +273,7 @@ int recurse_dir( if (S_ISDIR(sx.stx_mode)) { /* What? It's a directory now? Then someone must have quickly * replaced it. Let's handle that gracefully: convert it to a - * directory fd — which sould be riskless now that we pinned the + * directory fd — which should be riskless now that we pinned the * inode. */ subdir_fd = openat(AT_FDCWD, FORMAT_PROC_FD_PATH(inode_fd), O_DIRECTORY|O_CLOEXEC); diff --git a/src/boot/efi/cpio.c b/src/boot/efi/cpio.c index bffe4f638c6..bb7c988031e 100644 --- a/src/boot/efi/cpio.c +++ b/src/boot/efi/cpio.c @@ -43,7 +43,7 @@ static CHAR8* pad4(CHAR8 *p, const CHAR8* start) { assert(start); assert(p >= start); - /* Appends NUL bytes to 'p', until the address is divisable by 4, when taken relative to 'start' */ + /* Appends NUL bytes to 'p', until the address is divisible by 4, when taken relative to 'start' */ while ((p - start) % 4 != 0) *(p++) = 0; diff --git a/src/boot/efi/initrd.c b/src/boot/efi/initrd.c index b302743adf9..4475a3d5eee 100644 --- a/src/boot/efi/initrd.c +++ b/src/boot/efi/initrd.c @@ -80,9 +80,9 @@ EFI_STATUS initrd_register( if (!initrd_address || initrd_length == 0) return EFI_SUCCESS; - /* check if a LINUX_INITRD_MEDIA_GUID DevicePath is already registed. + /* check if a LINUX_INITRD_MEDIA_GUID DevicePath is already registered. LocateDevicePath checks for the "closest DevicePath" and returns its handle, - where as InstallMultipleProtocolInterfaces only maches identical DevicePaths. + where as InstallMultipleProtocolInterfaces only matches identical DevicePaths. */ err = BS->LocateDevicePath(&EfiLoadFile2Protocol, &dp, &handle); if (err != EFI_NOT_FOUND) /* InitrdMedia is already registered */ diff --git a/src/boot/efi/linux.c b/src/boot/efi/linux.c index f86fcc11432..c20ddbdfc6e 100644 --- a/src/boot/efi/linux.c +++ b/src/boot/efi/linux.c @@ -145,7 +145,7 @@ EFI_STATUS linux_exec( /* Linux kernel complains if it's not loaded at a properly aligned memory address. The correct alignment is provided by Linux as the SegmentAlignment in the PeOptionalHeader. Additionally the kernel needs to - be in a memory segment thats SizeOfImage (again from PeOptionalHeader) large, so that the Kernel has + be in a memory segment that's SizeOfImage (again from PeOptionalHeader) large, so that the Kernel has space for its BSS section. SizeOfImage is always larger than linux_length, which is only the size of Code, (static) Data and Headers. diff --git a/src/core/bpf-lsm.c b/src/core/bpf-lsm.c index 46c24468494..ed35cad91dd 100644 --- a/src/core/bpf-lsm.c +++ b/src/core/bpf-lsm.c @@ -368,7 +368,7 @@ int lsm_bpf_parse_filesystem( case -ENOMEM: return flags & FILESYSTEM_PARSE_LOG ? log_oom() : -ENOMEM; case -EEXIST: - /* Alredy in set, ignore */ + /* Already in set, ignore */ break; default: return r; diff --git a/src/home/homed-home.c b/src/home/homed-home.c index d8f192650ef..ccd99e3c9d4 100644 --- a/src/home/homed-home.c +++ b/src/home/homed-home.c @@ -440,7 +440,7 @@ static void home_start_retry_deactivate(Home *h) { assert(h); assert(h->manager); - /* Alrady allocated? */ + /* Already allocated? */ if (h->retry_deactivate_event_source) return; diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index 05e2950b4b4..e0b7279c712 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -1073,7 +1073,7 @@ static int lock_image_fd(int image_fd, const char *ip) { if (fstat(image_fd, &st) < 0) return log_error_errno(errno, "Failed to stat image file: %m"); if (S_ISBLK(st.st_mode)) { - /* Locking block devices doesn't really make sense, as this might interfear with + /* Locking block devices doesn't really make sense, as this might interfere with * udev's workings, and these locks aren't network propagated anyway, hence not what * we are after here. */ log_debug("Not locking image file '%s', since it's a block device.", ip); diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 32332ac0ba7..0ec01dc11e5 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -2872,7 +2872,7 @@ static int help(void) { " --no-pager Do not pipe output into a pager\n" " --no-legend Do not show the headers and footers\n" " -a --all Show status for all links\n" - " -s --stats Show detailed link statics\n" + " -s --stats Show detailed link statistics\n" " -l --full Do not ellipsize output\n" " -n --lines=INTEGER Number of journal entries to show\n" " --json=pretty|short|off\n" diff --git a/src/network/networkd-util.h b/src/network/networkd-util.h index 21e8a936297..6318b91118a 100644 --- a/src/network/networkd-util.h +++ b/src/network/networkd-util.h @@ -34,12 +34,12 @@ typedef enum NetworkConfigSource { typedef enum NetworkConfigState { NETWORK_CONFIG_STATE_PROBING = 1 << 0, /* address is probing by IPv4ACD */ NETWORK_CONFIG_STATE_REQUESTING = 1 << 1, /* request is queued */ - NETWORK_CONFIG_STATE_CONFIGURING = 1 << 2, /* e.g. address_configure() is called, but no responce is received yet */ + NETWORK_CONFIG_STATE_CONFIGURING = 1 << 2, /* e.g. address_configure() is called, but no response is received yet */ NETWORK_CONFIG_STATE_CONFIGURED = 1 << 3, /* e.g. address_configure() is called and received a response from kernel. * Note that address may not be ready yet, so please use address_is_ready() * to check whether the address can be usable or not. */ NETWORK_CONFIG_STATE_MARKED = 1 << 4, /* used GC'ing the old config */ - NETWORK_CONFIG_STATE_REMOVING = 1 << 5, /* e.g. address_remove() is called, but no responce is received yet */ + NETWORK_CONFIG_STATE_REMOVING = 1 << 5, /* e.g. address_remove() is called, but no response is received yet */ } NetworkConfigState; CONFIG_PARSER_PROTOTYPE(config_parse_link_local_address_family); diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c index 1db69b45128..9912c5acbb7 100644 --- a/src/nspawn/nspawn-oci.c +++ b/src/nspawn/nspawn-oci.c @@ -48,7 +48,7 @@ * should escaping be applied when joining mount options with ","? * devices cgroup support is bogus, "allow" and "deny" on the kernel level is about adding/removing entries, not about access * spec needs to say that "rwm" devices cgroup combination can't be the empty string - * cgrouspv1 crap: kernel, kernelTCP, swapiness, disableOOMKiller, swap, devices, leafWeight + * cgrouspv1 crap: kernel, kernelTCP, swappiness, disableOOMKiller, swap, devices, leafWeight * general: it shouldn't leak lower level abstractions this obviously * unmanagable cgroups stuff: realtimeRuntime/realtimePeriod * needs to say what happense when some option is not specified, i.e. which defaults apply diff --git a/src/shared/import-util.c b/src/shared/import-util.c index bb1e5136a73..97d39ee0477 100644 --- a/src/shared/import-util.c +++ b/src/shared/import-util.c @@ -90,7 +90,7 @@ int import_url_change_suffix( /* This drops the specified number of path components of the specified URI, i.e. the specified number * of non-empty substring between two "/" characters from the end of the string, and then append the * specified suffix instead. Before doing all this it chops off the "Query" and "Fragment" suffixes - * (they are *not* readded to the final URL). Note that n_drop_components may be 0 (in which case the + * (they are *not* re-added to the final URL). Note that n_drop_components may be 0 (in which case the * component are simply added to the end). The suffix may be specified as NULL or empty string in * which case nothing is appended, only the specified number of components chopped off. Note that the * function may be called with n_drop_components == 0 and suffix == NULL, in which case the "Query" diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c index 509cb9bf319..b1f10e1eae6 100644 --- a/src/sysext/sysext.c +++ b/src/sysext/sysext.c @@ -591,7 +591,7 @@ static int merge_subprocess(Hashmap *images, const char *workspace) { continue; } - /* Noice! This one is an extension we want. */ + /* Nice! This one is an extension we want. */ r = strv_extend(&extensions, img->name); if (r < 0) return log_oom(); diff --git a/src/test/test-kbd-util.c b/src/test/test-kbd-util.c index c7b4b842c02..f15cff47940 100644 --- a/src/test/test-kbd-util.c +++ b/src/test/test-kbd-util.c @@ -15,7 +15,7 @@ int main(int argc, char *argv[]) { r = get_keymaps(&maps); if (r < 0) { - log_error_errno(r, "Failed to aquire keymaps: %m"); + log_error_errno(r, "Failed to acquire keymaps: %m"); return 0; } diff --git a/test/TEST-64-UDEV-STORAGE/test.sh b/test/TEST-64-UDEV-STORAGE/test.sh index 227258f3e45..d9abfc5d95c 100755 --- a/test/TEST-64-UDEV-STORAGE/test.sh +++ b/test/TEST-64-UDEV-STORAGE/test.sh @@ -121,7 +121,7 @@ test_run() { for testcase in "${TESTCASES[@]}"; do _image_cleanup echo "------ $testcase: BEGIN ------" - # Note for my future frustrated self: `fun && xxx` (as wel as ||, if, while, + # Note for my future frustrated self: `fun && xxx` (as well as ||, if, while, # until, etc.) _DISABLES_ the `set -e` behavior in _ALL_ nested function # calls made from `fun()`, i.e. the function _CONTINUES_ even when a called # command returned non-zero EC. That may unexpectedly hide failing commands diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh index 10cd59f4722..22e11fe05cf 100755 --- a/test/units/testsuite-64.sh +++ b/test/units/testsuite-64.sh @@ -226,7 +226,7 @@ EOF # Initial partition table sfdisk -q -X gpt "$blockdev" <"$partscript" - # Delete the partitions, immediatelly recreate them, wait for udev to settle + # Delete the partitions, immediately recreate them, wait for udev to settle # down, and then check if we have any dangling symlinks in /dev/disk/. Rinse # and repeat. # diff --git a/test/units/testsuite-65.sh b/test/units/testsuite-65.sh index 3c3d795d63d..c2cbf33cf52 100755 --- a/test/units/testsuite-65.sh +++ b/test/units/testsuite-65.sh @@ -56,7 +56,7 @@ EOF systemd-analyze verify --recursive-errors=no /tmp/testfile2.service set +e -# Non-zero exit status since all associated dependencies are recusively loaded when the unit file is loaded +# Non-zero exit status since all associated dependencies are recursively loaded when the unit file is loaded systemd-analyze verify --recursive-errors=yes /tmp/testfile2.service \ && { echo 'unexpected success'; exit 1; } set -e