From 9a27ef092e7403d8b371025c9c0348895d3cf76e Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 15 Jun 2023 20:37:55 +0200 Subject: [PATCH] tree-wide: fix a couple of typos As reported by Fossies.org. --- TODO | 4 ++-- man/sd_journal_next.xml | 2 +- man/systemd-soft-reboot.service.xml | 2 +- man/systemd.timer.xml | 2 +- man/ukify.xml | 2 +- src/basic/time-util.c | 2 +- src/basic/xattr-util.c | 4 ++-- src/journal/test-journal-interleaving.c | 2 +- src/libsystemd/sd-event/test-event.c | 4 ++-- src/shared/pam-util.c | 2 +- src/sysupdate/sysupdate-resource.h | 2 +- src/test/test-btrfs.c | 2 +- src/test/test-mount-util.c | 2 +- src/tmpfiles/tmpfiles.c | 2 +- src/udev/udev-node.c | 2 +- src/ukify/ukify.py | 2 +- test/run-unit-tests.py | 2 +- test/units/testsuite-19.delegate.sh | 2 +- test/units/testsuite-82.sh | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/TODO b/TODO index a9aab29445b..bba30c12958 100644 --- a/TODO +++ b/TODO @@ -161,7 +161,7 @@ Features: to the kernel which will then upload it to the CPU. This should be distinct from .initrd to guarantee right ordering. also, and maybe more importantly support .microcode in PE add-ons, so that a microcode update can be shipped - indepdendently of any kernel. + independently of any kernel. * add clean mechanism concept for passing env/creds from initrd to host on switch root, so that cloud-init and similar have a clean, sane method to pass @@ -187,7 +187,7 @@ Features: * open up creds for uses in generators, and document clearly that encrypted creds are only supported if strictly tpm bound, but not when using the host - secret (as that is only avilable if /var/ is around. + secret (as that is only available if /var/ is around. * logind: when logging in, always take an fd to the home dir, to keep the dir busy, so that autofs release can never happen. (this is generally a good diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml index cc267fa1bd0..5b10b38b2bb 100644 --- a/man/sd_journal_next.xml +++ b/man/sd_journal_next.xml @@ -88,7 +88,7 @@ is the head of the journal, e.g. when this is called following sd_journal_seek_head(), then this is equivalent to sd_journal_next(), and the argument advanced will be ignored. - Similary, if the current location is the tail of the journal, e.g. when this is called following + Similarly, if the current location is the tail of the journal, e.g. when this is called following sd_journal_seek_tail(), then this is equivalent to sd_journal_previous(), and advanced will be ignored. Otherwise, this is equivalent to sd_journal_next() when advanced is diff --git a/man/systemd-soft-reboot.service.xml b/man/systemd-soft-reboot.service.xml index 0e95cba3be4..f2bbd814684 100644 --- a/man/systemd-soft-reboot.service.xml +++ b/man/systemd-soft-reboot.service.xml @@ -76,7 +76,7 @@ Resource Pass-Through Various runtime OS resources can passed from a system runtime to the next, through the userspace - reboot operation. Specificially: + reboot operation. Specifically: File descriptors placed in the file descriptor store of services that remain active diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml index cdc9bca4c07..577978c8e6f 100644 --- a/man/systemd.timer.xml +++ b/man/systemd.timer.xml @@ -215,7 +215,7 @@ clock does not pause. When a calendar timer elapses while the system is sleeping it will not be acted on immediately, but once the system is later resumed it will catch up and process all timers that triggered while the system was sleeping. Note that if a calendar timer elapsed more than once while - the system was continously sleeping the timer will only result in a single service activation. If + the system was continuously sleeping the timer will only result in a single service activation. If WakeSystem= (see below) is enabled a calendar time event elapsing while the system is suspended will cause the system to wake up (under the condition the system's hardware supports time-triggered wake-up functionality). diff --git a/man/ukify.xml b/man/ukify.xml index 06ae550530d..44fb3a52374 100644 --- a/man/ukify.xml +++ b/man/ukify.xml @@ -542,7 +542,7 @@ $ /usr/lib/systemd/ukify -c ukify.conf build \ Next, we can generate the certificate and keys: # /usr/lib/systemd/ukify genkey --config=/etc/kernel/uki.conf Writing SecureBoot private key to /etc/kernel/secure-boot.key.pem -Writing SecureBoot certicate to /etc/kernel/secure-boot.cert.pem +Writing SecureBoot certificate to /etc/kernel/secure-boot.cert.pem Writing private key for PCR signing to /etc/kernel/pcr-initrd.key.pem Writing public key for PCR signing to /etc/kernel/pcr-initrd.pub.pem Writing private key for PCR signing to /etc/kernel/pcr-system.key.pem diff --git a/src/basic/time-util.c b/src/basic/time-util.c index b3ade93122a..ef3afc904b8 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -1703,7 +1703,7 @@ TimestampStyle timestamp_style_from_string(const char *s) { t = (TimestampStyle) string_table_lookup(timestamp_style_table, ELEMENTSOF(timestamp_style_table), s); if (t >= 0) return t; - if (STRPTR_IN_SET(s, "µs", "μs")) /* acccept both µ symbols in unicode, i.e. micro symbol + greek small letter mu. */ + if (STRPTR_IN_SET(s, "µs", "μs")) /* accept both µ symbols in unicode, i.e. micro symbol + Greek small letter mu. */ return TIMESTAMP_US; if (STRPTR_IN_SET(s, "µs+utc", "μs+utc")) return TIMESTAMP_US_UTC; diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c index b42bf68f580..700fdf44b6e 100644 --- a/src/basic/xattr-util.c +++ b/src/basic/xattr-util.c @@ -152,9 +152,9 @@ int fd_getcrtime_at( /* So here's the deal: the creation/birth time (crtime/btime) of a file is a relatively newly supported concept * on Linux (or more strictly speaking: a concept that only recently got supported in the API, it was * implemented on various file systems on the lower level since a while, but never was accessible). However, we - * needed a concept like that for vaccuuming algorithms and such, hence we emulated it via a user xattr for a + * needed a concept like that for vacuuming algorithms and such, hence we emulated it via a user xattr for a * long time. Starting with Linux 4.11 there's statx() which exposes the timestamp to userspace for the first - * time, where it is available. Thius function will read it, but it tries to keep some compatibility with older + * time, where it is available. This function will read it, but it tries to keep some compatibility with older * systems: we try to read both the crtime/btime and the xattr, and then use whatever is older. After all the * concept is useful for determining how "old" a file really is, and hence using the older of the two makes * most sense. */ diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c index 97cca9bf6a5..f7293ef4b4e 100644 --- a/src/journal/test-journal-interleaving.c +++ b/src/journal/test-journal-interleaving.c @@ -240,7 +240,7 @@ static void test_skip_one(void (*setup)(void)) { test_check_numbers_down(j, 9); sd_journal_close(j); - /* Seek to tail, skip to head in a more complext way, then iterate down. */ + /* Seek to tail, skip to head in a more complex way, then iterate down. */ assert_ret(sd_journal_open_directory(&j, t, 0)); assert_ret(sd_journal_seek_tail(j)); assert_ret(sd_journal_next(j)); /* no-op */ diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c index fe0d83116db..50b6a793ce2 100644 --- a/src/libsystemd/sd-event/test-event.c +++ b/src/libsystemd/sd-event/test-event.c @@ -847,7 +847,7 @@ TEST(leave_ratelimit) { assert_se(sd_event_default(&e) >= 0); - /* Create an event source that will continously fire by creating a pipe whose write side is closed, + /* Create an event source that will continuously fire by creating a pipe whose write side is closed, * and which hence will only see EOF and constant EPOLLHUP */ assert_se(pipe2(pfd, O_CLOEXEC) >= 0); assert_se(sd_event_add_io(e, &s, pfd[0], EPOLLIN, hup_callback, &c) >= 0); @@ -855,7 +855,7 @@ TEST(leave_ratelimit) { assert_se(sd_event_source_set_ratelimit(s, 5*USEC_PER_MINUTE, 5) >= 0); pfd[0] = -EBADF; - pfd[1] = safe_close(pfd[1]); /* Trigger continous EOF */ + pfd[1] = safe_close(pfd[1]); /* Trigger continuous EOF */ for (;;) { r = sd_event_prepare(e); diff --git a/src/shared/pam-util.c b/src/shared/pam-util.c index 82e897ee53c..15a8f5de28f 100644 --- a/src/shared/pam-util.c +++ b/src/shared/pam-util.c @@ -51,7 +51,7 @@ int pam_syslog_pam_error(pam_handle_t *handle, int level, int error, const char return error; } -/* A small structure we store inside the PAM session object, that allows us to resue bus connections but pins +/* A small structure we store inside the PAM session object, that allows us to reuse bus connections but pins * it to the process thoroughly. */ struct PamBusData { sd_bus *bus; diff --git a/src/sysupdate/sysupdate-resource.h b/src/sysupdate/sysupdate-resource.h index 8bf19a45ec3..51f74cfcb39 100644 --- a/src/sysupdate/sysupdate-resource.h +++ b/src/sysupdate/sysupdate-resource.h @@ -67,7 +67,7 @@ static inline bool RESOURCE_IS_URL(ResourceType t) { } typedef enum PathRelativeTo { - /* Please make sure to folow the naming of the corresponding PartitionDesignator enum values, + /* Please make sure to follow the naming of the corresponding PartitionDesignator enum values, * where this makes sense, like for the following three. */ PATH_RELATIVE_TO_ROOT, PATH_RELATIVE_TO_ESP, diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c index ccb1661a914..ca01a8c8560 100644 --- a/src/test/test-btrfs.c +++ b/src/test/test-btrfs.c @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) { if (r < 0) log_error_errno(r, "Failed to make subvolume: %m"); - r = write_string_file("/xxxtest/afile", "ljsadhfljasdkfhlkjdsfha", WRITE_STRING_FILE_CREATE); + r = write_string_file("/xxxtest/file", "ljsadhfljasdkfhlkjdsfha", WRITE_STRING_FILE_CREATE); if (r < 0) log_error_errno(r, "Failed to write file: %m"); diff --git a/src/test/test-mount-util.c b/src/test/test-mount-util.c index 021eff1548c..536819e0fc2 100644 --- a/src/test/test-mount-util.c +++ b/src/test/test-mount-util.c @@ -485,7 +485,7 @@ TEST(umount_recursive) { /* Open /p/s/m file before we unmount everything (which might include /proc/) */ f = fopen("/proc/self/mountinfo", "re"); if (!f) { - log_error_errno(errno, "Faile to open /proc/self/mountinfo: %m"); + log_error_errno(errno, "Failed to open /proc/self/mountinfo: %m"); _exit(EXIT_FAILURE); } diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index e0087d997b8..43e12856495 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -3865,7 +3865,7 @@ static int help(void) { " --clean Clean up marked directories\n" " --remove Remove marked files/directories\n" " --boot Execute actions only safe at boot\n" - " --graceful Quitely ignore unknown users or groups\n" + " --graceful Quietly ignore unknown users or groups\n" " --prefix=PATH Only apply rules with the specified prefix\n" " --exclude-prefix=PATH Ignore rules with the specified prefix\n" " -E Ignore rules prefixed with /dev, /proc, /run, /sys\n" diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index 7c0c2803d2a..1bc2eda7649 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -489,7 +489,7 @@ static int link_update(sd_device *dev, const char *slink, bool add) { } } else { /* The requested devlink does not exist, or the target device does not exist and the devlink - * points to a non-existing device. Let's search the deivce that has the highest priority, + * points to a non-existing device. Let's search the device that has the highest priority, * and update the devlink. */ ; } diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py index 3db2bac384a..9cdcd0f76ae 100755 --- a/src/ukify/ukify.py +++ b/src/ukify/ukify.py @@ -842,7 +842,7 @@ def generate_keys(opts): print(f'Writing SecureBoot private key to {opts.sb_key}') with temporary_umask(0o077): opts.sb_key.write_bytes(key_pem) - print(f'Writing SecureBoot certicate to {opts.sb_cert}') + print(f'Writing SecureBoot certificate to {opts.sb_cert}') opts.sb_cert.write_bytes(cert_pem) for priv_key, pub_key, _ in key_path_groups(opts): diff --git a/test/run-unit-tests.py b/test/run-unit-tests.py index 7bb904ddd11..e6f26c28219 100755 --- a/test/run-unit-tests.py +++ b/test/run-unit-tests.py @@ -53,7 +53,7 @@ for test in tests: print(f'{YELLOW}SKIP: {name}{RESET_ALL}') total.skip += 1 elif ex.returncode == 127: - print(f'{YELLOW}SKIP: {name} (no interpeter) {RESET_ALL}') + print(f'{YELLOW}SKIP: {name} (no interpreter) {RESET_ALL}') total.skip += 1 else: print(f'{RED}FAIL: {name}{RESET_ALL}') diff --git a/test/units/testsuite-19.delegate.sh b/test/units/testsuite-19.delegate.sh index 691913cb816..83446a5704b 100755 --- a/test/units/testsuite-19.delegate.sh +++ b/test/units/testsuite-19.delegate.sh @@ -92,7 +92,7 @@ if test -f /sys/fs/cgroup/cgroup.max.depth; then test -w "/sys/fs/cgroup/system.slice/$unit/zzz/cgroup.max.depth" fi -# Check that the invoked process itsel is also in the subgroup +# Check that the invoked process itself is also in the subgroup unit="test-subgroup-$RANDOM.service" systemd-run --wait \ --unit="$unit" \ diff --git a/test/units/testsuite-82.sh b/test/units/testsuite-82.sh index a9e4411d6e8..24945ba5658 100755 --- a/test/units/testsuite-82.sh +++ b/test/units/testsuite-82.sh @@ -107,7 +107,7 @@ else # This is the first boot systemd-notify --status="First Boot" - # Let's upload an fd to the fdstore, so that we can verify fdstore passing works correcly + # Let's upload an fd to the fdstore, so that we can verify fdstore passing works correctly T="/dev/shm/fdstore.$RANDOM" echo "wuffwuff" >"$T" systemd-notify --fd=3 --pid=parent 3<"$T"