From 8f66c9fbd068d4f264690a69ec466e4efd770fb6 Mon Sep 17 00:00:00 2001 From: lifubang Date: Tue, 3 Oct 2023 20:08:17 +0800 Subject: [PATCH 1/2] fix two typos Signed-off-by: lifubang (cherry picked from commit 109dcadd9d1756258ba0ee096871d11c8581002e) Signed-off-by: lifubang --- libcontainer/seccomp/patchbpf/enosys_linux.go | 2 +- man/runc-update.8.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libcontainer/seccomp/patchbpf/enosys_linux.go b/libcontainer/seccomp/patchbpf/enosys_linux.go index 6376512b086..efe6dca58b2 100644 --- a/libcontainer/seccomp/patchbpf/enosys_linux.go +++ b/libcontainer/seccomp/patchbpf/enosys_linux.go @@ -81,7 +81,7 @@ import "C" var retErrnoEnosys = uint32(C.C_ACT_ERRNO_ENOSYS) // This syscall is used for multiplexing "large" syscalls on s390(x). Unknown -// syscalls will end up with this syscall number, so we need to explcitly +// syscalls will end up with this syscall number, so we need to explicitly // return -ENOSYS for this syscall on those architectures. const s390xMultiplexSyscall libseccomp.ScmpSyscall = 0 diff --git a/man/runc-update.8.md b/man/runc-update.8.md index 8ceaa386fe8..93a7e566bab 100644 --- a/man/runc-update.8.md +++ b/man/runc-update.8.md @@ -41,7 +41,7 @@ In case **-r** is used, the JSON format is like this: # OPTIONS **--resources**|**-r** _resources.json_ -: Read the new resource limtis from _resources.json_. Use **-** to read from +: Read the new resource limits from _resources.json_. Use **-** to read from stdin. If this option is used, all other options are ignored. **--blkio-weight** _weight_ From b365458f40a43d0d9e108cabccc2a003345873c9 Mon Sep 17 00:00:00 2001 From: lifubang Date: Wed, 4 Oct 2023 13:24:36 +0800 Subject: [PATCH 2/2] fix a typo in cloned_binary.c: re-use -> reuse Signed-off-by: lifubang --- libcontainer/nsenter/cloned_binary.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcontainer/nsenter/cloned_binary.c b/libcontainer/nsenter/cloned_binary.c index 4268ebda9e0..d1b2d4c546f 100644 --- a/libcontainer/nsenter/cloned_binary.c +++ b/libcontainer/nsenter/cloned_binary.c @@ -151,7 +151,7 @@ static int is_self_cloned(void) * Is the binary a fully-sealed memfd? We don't need CLONED_BINARY_ENV for * this, because you cannot write to a sealed memfd no matter what (so * sharing it isn't a bad thing -- and an admin could bind-mount a sealed - * memfd to /usr/bin/runc to allow re-use). + * memfd to /usr/bin/runc to allow reuse). */ ret = fcntl(fd, F_GET_SEALS); if (ret >= 0) {