diff options
author | Ben Boeckel <mathstuf@gmail.com> | 2019-04-27 02:22:40 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-04-29 16:47:18 +0200 |
commit | 5238e9575906297608ff802a27e2ff9effa3b338 (patch) | |
tree | e17c534a09908167a0697a49ed3237f43134eb4c /src/nspawn | |
parent | network: drop invalid assertion (diff) | |
download | systemd-5238e9575906297608ff802a27e2ff9effa3b338.tar.xz systemd-5238e9575906297608ff802a27e2ff9effa3b338.zip |
codespell: fix spelling errors
Diffstat (limited to 'src/nspawn')
-rw-r--r-- | src/nspawn/nspawn-cgroup.c | 2 | ||||
-rw-r--r-- | src/nspawn/nspawn-oci.c | 1 | ||||
-rw-r--r-- | src/nspawn/nspawn-patch-uid.c | 2 | ||||
-rw-r--r-- | src/nspawn/nspawn.c | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c index 168125d311..ec62b64b00 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c @@ -161,7 +161,7 @@ int create_subcgroup(pid_t pid, bool keep_unit, CGroupUnified unified_requested) * attributes. Hence, let's insert an intermediary cgroup to cover that case too. * * Note that we only bother with the main hierarchy here, not with any secondary ones. On the unified setup - * that's fine because there's only one hiearchy anyway and controllers are enabled directly on it. On the + * that's fine because there's only one hierarchy anyway and controllers are enabled directly on it. On the * legacy setup, this is fine too, since delegation of controllers is generally not safe there, hence we won't * do it. */ diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c index 6040243899..97323f31dd 100644 --- a/src/nspawn/nspawn-oci.c +++ b/src/nspawn/nspawn-oci.c @@ -58,6 +58,7 @@ * /bin/mount regarding NFS and FUSE required? * what does terminal=false mean? * sysctl inside or outside? whitelisting? + * swapiness typo -> swappiness * * Unsupported: * diff --git a/src/nspawn/nspawn-patch-uid.c b/src/nspawn/nspawn-patch-uid.c index c2b779c1d1..4885744cfc 100644 --- a/src/nspawn/nspawn-patch-uid.c +++ b/src/nspawn/nspawn-patch-uid.c @@ -103,7 +103,7 @@ static int shift_acl(acl_t acl, uid_t shift, acl_t *ret) { if (IN_SET(tag, ACL_USER, ACL_GROUP)) { - /* We don't distuingish here between uid_t and gid_t, let's make sure the compiler checks that + /* We don't distinguish here between uid_t and gid_t, let's make sure the compiler checks that * this is actually OK */ assert_cc(sizeof(uid_t) == sizeof(gid_t)); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 0f64aa68f3..27829431ac 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1495,7 +1495,7 @@ static int verify_arguments(void) { /* We don't support --private-users-chown together with any of the volatile modes since we couldn't * change the read-only part of the tree (i.e. /usr) anyway, or because it would trigger a massive - * copy-up (in case of overlay) making the entire excercise pointless. */ + * copy-up (in case of overlay) making the entire exercise pointless. */ if (arg_userns_chown && arg_volatile_mode != VOLATILE_NO) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "--volatile= and --private-users-chown may not be combined."); @@ -3293,7 +3293,7 @@ static int outer_child( /* Mark everything as shared so our mounts get propagated down. This is * required to make new bind mounts available in systemd services - * inside the containter that create a new mount namespace. + * inside the container that create a new mount namespace. * See https://github.com/systemd/systemd/issues/3860 * Further submounts (such as /dev) done after this will inherit the * shared propagation mode. */ @@ -3715,7 +3715,7 @@ static int merge_settings(Settings *settings, const char *path) { /* Copy the full capabilities over too */ if (capability_quintet_is_set(&settings->full_capabilities)) { if (!arg_settings_trusted) - log_warning("Ignoring capabilitiy settings, file %s is not trusted.", path); + log_warning("Ignoring capability settings, file %s is not trusted.", path); else arg_full_capabilities = settings->full_capabilities; } |