[lxc-devel] [lxc/master] Spelling
jsoref on Github
lxc-bot at linuxcontainers.org
Tue Oct 30 08:29:05 UTC 2018
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 401 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20181030/fc1fe938/attachment.bin>
-------------- next part --------------
From a432ad890f23b3bf74d670266c2f48585f01b7d7 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:45:18 +0000
Subject: [PATCH 01/59] spelling: allocate
---
src/lxc/string_utils.h | 2 +-
src/lxc/utils.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/string_utils.h b/src/lxc/string_utils.h
index d289d18e0c..4065e4e6b1 100644
--- a/src/lxc/string_utils.h
+++ b/src/lxc/string_utils.h
@@ -101,7 +101,7 @@ __attribute__((sentinel)) extern char *must_append_path(char *first, ...);
/* Return copy of string @entry. Do not fail. */
extern char *must_copy_string(const char *entry);
-/* Re-alllocate a pointer, do not fail */
+/* Re-allocate a pointer, do not fail */
extern void *must_realloc(void *orig, size_t sz);
extern int lxc_char_left_gc(const char *buffer, size_t len);
diff --git a/src/lxc/utils.h b/src/lxc/utils.h
index bc298acc8d..6314b7985a 100644
--- a/src/lxc/utils.h
+++ b/src/lxc/utils.h
@@ -211,7 +211,7 @@ __attribute__((sentinel)) extern char *must_append_path(char *first, ...);
/* return copy of string @entry; do not fail. */
extern char *must_copy_string(const char *entry);
-/* Re-alllocate a pointer, do not fail */
+/* Re-allocate a pointer, do not fail */
extern void *must_realloc(void *orig, size_t sz);
extern bool lxc_nic_exists(char *nic);
From f8d5bace185fd680d00d1fa85c56ff34e1fb85af Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:45:53 +0000
Subject: [PATCH 02/59] spelling: ambiguous
---
src/lxc/confile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index e1f4266b6c..45095855ae 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -3186,7 +3186,7 @@ static int get_config_selinux_context(const char *key, char *retv, int inlen,
/* If you ask for a specific cgroup value, i.e. lxc.cgroup.devices.list, then
* just the value(s) will be printed. Since there still could be more than one,
* it is newline-separated.
- * (Maybe that's ambigous, since some values, i.e. devices.list, will already
+ * (Maybe that's ambiguous, since some values, i.e. devices.list, will already
* have newlines?)
* If you ask for 'lxc.cgroup", then all cgroup entries will be printed, in
* 'lxc.cgroup.subsystem.key = value' format.
From 9610817cbc8d7adaa6f9d6da0041d05c3851e995 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:46:40 +0000
Subject: [PATCH 03/59] spelling: answer
---
src/lxc/nl.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/nl.h b/src/lxc/nl.h
index 2afda5f0f0..e6bf0d7436 100644
--- a/src/lxc/nl.h
+++ b/src/lxc/nl.h
@@ -126,9 +126,9 @@ int __netlink_send(struct nl_handler *handler, struct nlmsghdr *nlmsg);
* Returns 0 on success, < 0 otherwise
*/
int netlink_transaction(struct nl_handler *handler,
- struct nlmsg *request, struct nlmsg *anwser);
+ struct nlmsg *request, struct nlmsg *answer);
int __netlink_transaction(struct nl_handler *handler, struct nlmsghdr *request,
- struct nlmsghdr *anwser);
+ struct nlmsghdr *answer);
/*
* nla_put_string: copy a null terminated string to a netlink message
From 49507482a400a16e5cf9b0a4b204731f0decb9e7 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:47:09 +0000
Subject: [PATCH 04/59] spelling: architecture
---
doc/ja/lxc-attach.sgml.in | 2 +-
doc/ko/lxc-attach.sgml.in | 2 +-
doc/lxc-attach.sgml.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/ja/lxc-attach.sgml.in b/doc/ja/lxc-attach.sgml.in
index fe2e40b23a..fa643c75e4 100644
--- a/doc/ja/lxc-attach.sgml.in
+++ b/doc/ja/lxc-attach.sgml.in
@@ -162,7 +162,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<citerefentry>
<refentrytitle><filename>lxc.conf</filename></refentrytitle>
<manvolnum>5</manvolnum>
- </citerefentry>. By default, the current archictecture of the
+ </citerefentry>. By default, the current architecture of the
running container will be used.
-->
コマンドを実行するコンテナのアーキテクチャを指定します。
diff --git a/doc/ko/lxc-attach.sgml.in b/doc/ko/lxc-attach.sgml.in
index 9b94b9299c..9886c2e059 100644
--- a/doc/ko/lxc-attach.sgml.in
+++ b/doc/ko/lxc-attach.sgml.in
@@ -163,7 +163,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
<citerefentry>
<refentrytitle><filename>lxc.conf</filename></refentrytitle>
<manvolnum>5</manvolnum>
- </citerefentry>. By default, the current archictecture of the
+ </citerefentry>. By default, the current architecture of the
running container will be used.
-->
명령어를 실행하는 컨테이너의 아키텍처를 지정한다.
diff --git a/doc/lxc-attach.sgml.in b/doc/lxc-attach.sgml.in
index e0c1be7462..41955fcadd 100644
--- a/doc/lxc-attach.sgml.in
+++ b/doc/lxc-attach.sgml.in
@@ -136,7 +136,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<citerefentry>
<refentrytitle><filename>lxc.conf</filename></refentrytitle>
<manvolnum>5</manvolnum>
- </citerefentry>. By default, the current archictecture of the
+ </citerefentry>. By default, the current architecture of the
running container will be used.
</para>
</listitem>
From 34ca72bc01c6db9d0894f3c9e35a0ebf8ba79ac5 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:47:57 +0000
Subject: [PATCH 05/59] spelling: array
---
src/lxc/lxccontainer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 8c26769b45..6c35ab6532 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2254,7 +2254,7 @@ static bool add_to_array(char ***names, char *cname, int pos)
if (!newnames[pos])
return false;
- /* Sort the arrray as we will use binary search on it. */
+ /* Sort the array as we will use binary search on it. */
qsort(newnames, pos + 1, sizeof(char *),
(int (*)(const void *, const void *))string_cmp);
@@ -2273,7 +2273,7 @@ static bool add_to_clist(struct lxc_container ***list, struct lxc_container *c,
*list = newlist;
newlist[pos] = c;
- /* Sort the arrray as we will use binary search on it. */
+ /* Sort the array as we will use binary search on it. */
if (sort)
qsort(newlist, pos + 1, sizeof(struct lxc_container *),
(int (*)(const void *, const void *))container_cmp);
From ec4a39a623c1e7a607db9c7cdcc68eb43894e26a Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:48:09 +0000
Subject: [PATCH 06/59] spelling: asynchronous
---
src/lxc/terminal.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/terminal.h b/src/lxc/terminal.h
index ef09d50d29..bfd271f446 100644
--- a/src/lxc/terminal.h
+++ b/src/lxc/terminal.h
@@ -250,7 +250,7 @@ extern void lxc_terminal_winsz(int srcfd, int dstfd);
* Must be called with process_lock held to protect the lxc_ttys list, or from
* a non-threaded context.
*
- * Note that the signal handler isn't installed as a classic asychronous
+ * Note that the signal handler isn't installed as a classic asynchronous
* handler, rather signalfd(2) is used so that we can handle the signal when
* we're ready for it. This avoids deadlocks since a signal handler (ie
* lxc_terminal_sigwinch()) would need to take the thread mutex to prevent
From 45195b53c72d54c96f19bc639247671a912cc9ab Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:49:12 +0000
Subject: [PATCH 07/59] spelling: backingstorage
---
doc/ja/lxc-copy.sgml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/ja/lxc-copy.sgml.in b/doc/ja/lxc-copy.sgml.in
index 69bc9f4c1b..7a26842ea5 100644
--- a/doc/ja/lxc-copy.sgml.in
+++ b/doc/ja/lxc-copy.sgml.in
@@ -308,7 +308,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<para><!-- Specify the backing storage type to be used for the copy
where 'backingstorage' is of type 'btrfs', 'dir', 'lvm', 'loop',
'overlay', or 'zfs'. -->
- コピー先コンテナのバッキングストレージのタイプを指定します。ここで 'backingsotrage' は 'btrfs'、'dir'、'lvm'、'loop'、'overlay'、'zfs' のどれかです。
+ コピー先コンテナのバッキングストレージのタイプを指定します。ここで 'backingstorage' は 'btrfs'、'dir'、'lvm'、'loop'、'overlay'、'zfs' のどれかです。
</para>
</listitem>
</varlistentry>
From 1782419763425a6f6c735d52f74a1670b3f93421 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:49:52 +0000
Subject: [PATCH 08/59] spelling: capabilities
---
src/lxc/conf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 7307770a89..00767bb9fb 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2916,7 +2916,7 @@ static int idmaptool_on_path_and_privileged(const char *binary, cap_value_t cap)
* of the doubt. Otherwise we might fail even though all the necessary
* file capabilities are set.
*/
- DEBUG("Cannot check for file capabilites as full capability support is "
+ DEBUG("Cannot check for file capabilities as full capability support is "
"missing. Manual intervention needed");
fret = 1;
#endif
From 8c51f38eb11245ba7b7f7ce81cddef2c6d9c1464 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:50:12 +0000
Subject: [PATCH 09/59] spelling: character
---
src/lxc/criu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index 60cdb17e81..c40e93a713 100644
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -106,7 +106,7 @@ static int load_tty_major_minor(char *directory, char *output, int len)
ret = snprintf(path, sizeof(path), "%s/tty.info", directory);
if (ret < 0 || ret >= sizeof(path)) {
- ERROR("snprintf'd too many chacters: %d", ret);
+ ERROR("snprintf'd too many characters: %d", ret);
return -1;
}
@@ -1201,7 +1201,7 @@ static int save_tty_major_minor(char *directory, struct lxc_container *c, char *
ret = snprintf(path, sizeof(path), "/proc/%d/root/dev/console", c->init_pid(c));
if (ret < 0 || ret >= sizeof(path)) {
- ERROR("snprintf'd too many chacters: %d", ret);
+ ERROR("snprintf'd too many characters: %d", ret);
return -1;
}
From f346db95706503a4e13ade9c5a94d4b15c52424d Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:50:25 +0000
Subject: [PATCH 10/59] spelling: checkpoint
---
doc/ko/lxc.sgml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/ko/lxc.sgml.in b/doc/ko/lxc.sgml.in
index dcfd970c03..dbfafa141a 100644
--- a/doc/ko/lxc.sgml.in
+++ b/doc/ko/lxc.sgml.in
@@ -107,7 +107,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
manage a container with simple command lines and complete enough
to be used for other purposes.
-->
- 이 프로젝트의 첫번째 목적은 컨테이너 프로젝트에 속해있는 커널 개발자들의 작업을 편하게 하며, 특히 새로운 기능인 Checkpoing/Restart에 대해 계속 작업을 진행해 나가는 것이다.
+ 이 프로젝트의 첫번째 목적은 컨테이너 프로젝트에 속해있는 커널 개발자들의 작업을 편하게 하며, 특히 새로운 기능인 Checkpoint/Restart에 대해 계속 작업을 진행해 나가는 것이다.
<command>lxc</command>는 작지만, 컨테이너를 간단한 명령어를 통해 쉽게 관리할 수 있고, 다목적으로 사용되기에도 충분하다.
</para>
</refsect1>
From 216c708b5bf65ff29ac3b02efc9a52d506b686b7 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:51:58 +0000
Subject: [PATCH 11/59] spelling: comma
---
src/lxc/cgroups/cgfsng.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 43403ce429..b895c51693 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -31,7 +31,7 @@
*
* This new implementation assumes that cgroup filesystems are mounted
* under /sys/fs/cgroup/clist where clist is either the controller, or
- * a comman-separated list of controllers.
+ * a comma-separated list of controllers.
*/
#ifndef _GNU_SOURCE
From bfcb4fb426d276ebfc5c9bc2290855835d52d376 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:52:09 +0000
Subject: [PATCH 12/59] spelling: command
---
src/lxc/lxc.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h
index 97bf7a5e5a..725ec189b9 100644
--- a/src/lxc/lxc.h
+++ b/src/lxc/lxc.h
@@ -48,7 +48,7 @@ struct lxc_handler;
/*
* Start the specified command inside a system container
* @name : the name of the container
- * @argv : an array of char * corresponding to the commande line
+ * @argv : an array of char * corresponding to the command line
* @conf : configuration
* @daemonize : whether or not the container is daemonized
* Returns 0 on success, < 0 otherwise
@@ -60,7 +60,7 @@ extern int lxc_start(const char *name, char *const argv[],
/*
* Start the specified command inside an application container
* @name : the name of the container
- * @argv : an array of char * corresponding to the commande line
+ * @argv : an array of char * corresponding to the command line
* @quiet : if != 0 then lxc-init won't produce any output
* @conf : configuration
* @daemonize : whether or not the container is daemonized
From 9ce0e324200656910e2bad8e86908b807e902d36 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:52:23 +0000
Subject: [PATCH 13/59] spelling: committer
---
src/lxc/start.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/start.c b/src/lxc/start.c
index 55c2e0e99c..583ba89839 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1503,7 +1503,7 @@ int resolve_clone_flags(struct lxc_handler *handler)
* getpid() in the child would return the parent's pid. This is all fixed in
* newer glibc versions where the getpid() cache is removed and the pid/tid is
* not reset anymore.
- * However, if for whatever reason you - dear commiter - somehow need to get the
+ * However, if for whatever reason you - dear committer - somehow need to get the
* pid of the dummy intermediate process for do_share_ns() you need to call
* lxc_raw_getpid(). The next lxc_raw_clone() call does not employ CLONE_VM and
* will be fine.
From 4cf90e5fb4a8cfd6acfcc4a96172b7c5fecd97eb Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:52:44 +0000
Subject: [PATCH 14/59] spelling: configuration
---
src/lxc/lxccontainer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
index cb0cf8d2d4..45fe7edc2b 100644
--- a/src/lxc/lxccontainer.h
+++ b/src/lxc/lxccontainer.h
@@ -299,7 +299,7 @@ struct lxc_container {
bool (*destroy)(struct lxc_container *c);
/*!
- * \brief Save configuaration to a file.
+ * \brief Save configuration to a file.
*
* \param c Container.
* \param alt_file Full path to file to save configuration in.
From caf3233757eb9d1bdf238e9dd9c64bcab0aff890 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:54:44 +0000
Subject: [PATCH 15/59] spelling: constant
---
src/lxc/lxccontainer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
index 45fe7edc2b..8e38928c3a 100644
--- a/src/lxc/lxccontainer.h
+++ b/src/lxc/lxccontainer.h
@@ -824,7 +824,7 @@ struct lxc_container {
/*!
* \brief An API call to perform various migration operations
*
- * \param cmd One of the MIGRATE_ contstants.
+ * \param cmd One of the MIGRATE_ constants.
* \param opts A migrate_opts struct filled with relevant options.
* \param size The size of the migrate_opts struct, i.e. sizeof(struct migrate_opts).
*
From c59a99c8e3670597481963e1aaa1804fde8acbbf Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:53:11 +0000
Subject: [PATCH 16/59] spelling: container
---
src/lxc/conf.c | 2 +-
src/lxc/tools/lxc_autostart.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 00767bb9fb..1905fd156a 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -4360,7 +4360,7 @@ struct lxc_list *get_minimal_idmap(struct lxc_conf *conf)
* - the container root {g,u}id as seen from the host > user's host {g,u}id
* - the container root -> some sub{g,u}id
* The former we add, if the user did not specifiy a mapping. The latter we
- * retrieve from the ontainer's configured {g,u}id mappings as it must have been
+ * retrieve from the container's configured {g,u}id mappings as it must have been
* there to start the container in the first place.
*/
int userns_exec_1(struct lxc_conf *conf, int (*fn)(void *), void *data,
diff --git a/src/lxc/tools/lxc_autostart.c b/src/lxc/tools/lxc_autostart.c
index 1209897ec8..d6f3cb126e 100644
--- a/src/lxc/tools/lxc_autostart.c
+++ b/src/lxc/tools/lxc_autostart.c
@@ -417,7 +417,7 @@ int main(int argc, char *argv[])
}
}
- /* We have a candidate continer to process */
+ /* We have a candidate container to process */
c->want_daemonize(c, 1);
if (my_args.shutdown) {
From 46b6bc5e4ebd60c25d49ed1c5af68b268d12f3f9 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:54:21 +0000
Subject: [PATCH 17/59] spelling: control
---
doc/ja/lxc.container.conf.sgml.in | 2 +-
src/lxc/cgroups/cgfsng.c | 2 +-
src/lxc/log.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in
index e35005c69c..a0fbb1d88d 100644
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -1890,7 +1890,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<variablelist>
<varlistentry>
<term>
- <option>lxc.cgroup.[controll name]</option>
+ <option>lxc.cgroup.[control name]</option>
</term>
<listitem>
<para>
diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index b895c51693..7474ba140f 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1689,7 +1689,7 @@ static bool cg_mount_needs_subdirs(int type)
/* After $rootfs/sys/fs/container/controller/the/cg/path has been created,
* remount controller ro if needed and bindmount the cgroupfs onto
- * controll/the/cg/path.
+ * control/the/cg/path.
*/
static int cg_legacy_mount_controllers(int type, struct hierarchy *h,
char *controllerpath, char *cgpath,
diff --git a/src/lxc/log.c b/src/lxc/log.c
index 203accc31a..f240af8ac8 100644
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -296,7 +296,7 @@ static int lxc_unix_epoch_to_utc(char *buf, size_t bufsize, const struct timespe
* think you are, you __will__ cause trouble using them.
* (As a short example how this can cause trouble: LXD uses forkstart to fork
* off a new process that runs the container. At the same time the go runtime
- * LXD relies on does its own multi-threading thing which we can't controll. The
+ * LXD relies on does its own multi-threading thing which we can't control. The
* fork()ing + threading then seems to mess with the locking states in these
* time functions causing deadlocks.)
* The current solution is to be good old unix people and use the Epoch as our
From 5df978fe045a4ae015fb272d8a38bb2305846ce9 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:55:05 +0000
Subject: [PATCH 18/59] spelling: convenience
---
src/lxc/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 5714a78df0..be5f3ebe07 100644
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -1385,7 +1385,7 @@ bool lxc_switch_uid_gid(uid_t uid, gid_t gid)
return true;
}
-/* Simple covenience function which enables uniform logging. */
+/* Simple convenience function which enables uniform logging. */
bool lxc_setgroups(int size, gid_t list[])
{
if (setgroups(size, list) < 0) {
From 5dad8086daa40526253b6e07a039ac65484b0d0b Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:54:56 +0000
Subject: [PATCH 19/59] spelling: could
---
src/tests/startone.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/startone.c b/src/tests/startone.c
index 86cdf4d586..a69c3c9ea6 100644
--- a/src/tests/startone.c
+++ b/src/tests/startone.c
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
sprintf(buf, "0");
b = c->set_cgroup_item(c, "cpuset.cpus", buf);
if (b) {
- fprintf(stderr, "%d: %s not running but coudl set cgroup settings\n", __LINE__, MYNAME);
+ fprintf(stderr, "%d: %s not running but could set cgroup settings\n", __LINE__, MYNAME);
goto out;
}
From 96c43e51083e96e694fc0d483baa28ec6482cc2f Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 06:59:37 +0000
Subject: [PATCH 20/59] spelling: describing
---
src/lxc/monitor.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/monitor.h b/src/lxc/monitor.h
index d13a612526..4668608af1 100644
--- a/src/lxc/monitor.h
+++ b/src/lxc/monitor.h
@@ -78,7 +78,7 @@ extern int lxc_monitor_read_timeout(int fd, struct lxc_msg *msg, int timeout);
/*
* Blocking read from multiple monitors for the next container state
* change with timeout
- * @fds : struct pollfd descripting the fds to use
+ * @fds : struct pollfd describing the fds to use
* @nfds : the number of entries in fds
* @msg : the variable which will be filled with the state
* @timeout : the timeout in seconds to wait for a state change
From ca3079cffd57e307e46614db085b8843d9972825 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:00:01 +0000
Subject: [PATCH 21/59] spelling: device
---
src/lxc/confile_utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/confile_utils.c b/src/lxc/confile_utils.c
index 36341fb73c..04926854d1 100644
--- a/src/lxc/confile_utils.c
+++ b/src/lxc/confile_utils.c
@@ -542,7 +542,7 @@ int network_ifname(char *valuep, const char *value, size_t size)
retlen = strlcpy(valuep, value, size);
if (retlen >= size)
- ERROR("Network devie name \"%s\" is too long (>= %zu)", value,
+ ERROR("Network device name \"%s\" is too long (>= %zu)", value,
size);
return 0;
From 5b86734fba56d7d99a4b630763796ccd9d35204d Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:01:12 +0000
Subject: [PATCH 22/59] spelling: exiting
---
src/lxc/cmd/lxc_monitord.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/cmd/lxc_monitord.c b/src/lxc/cmd/lxc_monitord.c
index f8312998b9..3b931b3610 100644
--- a/src/lxc/cmd/lxc_monitord.c
+++ b/src/lxc/cmd/lxc_monitord.c
@@ -458,7 +458,7 @@ int main(int argc, char *argv[])
}
if (quit == LXC_MAINLOOP_CLOSE) {
- NOTICE("Got quit command. lxc-monitord is exitting");
+ NOTICE("Got quit command. lxc-monitord is exiting");
break;
}
}
From 814da0550a9a6824a2ba7cf487223b229a6b3975 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:01:26 +0000
Subject: [PATCH 23/59] spelling: explicitly
---
src/lxc/tools/lxc_ls.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/tools/lxc_ls.c b/src/lxc/tools/lxc_ls.c
index 7f1510f936..cb3eb1e52d 100644
--- a/src/lxc/tools/lxc_ls.c
+++ b/src/lxc/tools/lxc_ls.c
@@ -463,7 +463,7 @@ static int ls_get(struct ls **m, size_t *size, const struct lxc_arguments *args,
if (!l->name)
goto put_and_next;
- /* Do not record stuff the user did not explictly request. */
+ /* Do not record stuff the user did not explicitly request. */
if (args->ls_fancy) {
/* Maybe we should even consider the name sensitive and
* hide it when you're not allowed to control the
From fea1ca1e88fa245b214f48c8509f356c54744bc6 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:01:50 +0000
Subject: [PATCH 24/59] spelling: feature
---
src/tests/criu_check_feature.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/criu_check_feature.c b/src/tests/criu_check_feature.c
index 8d20035366..6ae4b1d403 100644
--- a/src/tests/criu_check_feature.c
+++ b/src/tests/criu_check_feature.c
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
goto on_error_put;
}
- /* do the actual fature check for memory tracking */
+ /* do the actual feature check for memory tracking */
m_opts.features_to_check = FEATURE_MEM_TRACK;
if (c->migrate(c, MIGRATE_FEATURE_CHECK, &m_opts, sizeof(struct migrate_opts))) {
lxc_debug("%s\n", "System does not support \"FEATURE_MEM_TRACK\".");
From e0e82c6894729c173bfa03445cdffc11c7384106 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:08:31 +0000
Subject: [PATCH 25/59] spelling: hierarchy
---
doc/ja/lxc.container.conf.sgml.in | 2 +-
doc/lxc.container.conf.sgml.in | 2 +-
src/lxc/pam/pam_cgfs.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in
index a0fbb1d88d..cb9a8a7603 100644
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -1916,7 +1916,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<para>
<!--
Specify the control group value to be set on the unified cgroup
- shierarchy. The controller name is the literal name of the control
+ hierarchy. The controller name is the literal name of the control
group. The permitted names and the syntax of their values is not
dictated by LXC, instead it depends on the features of the Linux
kernel running at the time the container is started, eg.
diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
index d217e53d9c..0a20e06dbc 100644
--- a/doc/lxc.container.conf.sgml.in
+++ b/doc/lxc.container.conf.sgml.in
@@ -1443,7 +1443,7 @@ dev/null proc/kcore none bind,relative 0 0
<listitem>
<para>
Specify the control group value to be set on the unified cgroup
- shierarchy. The controller name is the literal name of the control
+ hierarchy. The controller name is the literal name of the control
group. The permitted names and the syntax of their values is not
dictated by LXC, instead it depends on the features of the Linux
kernel running at the time the container is started, eg.
diff --git a/src/lxc/pam/pam_cgfs.c b/src/lxc/pam/pam_cgfs.c
index 4b2aa567e3..855a40f87f 100644
--- a/src/lxc/pam/pam_cgfs.c
+++ b/src/lxc/pam/pam_cgfs.c
@@ -1281,7 +1281,7 @@ static inline int cg_get_version_of_mntpt(const char *path)
}
/* Detect and store information about the cgroupfs v2 hierarchy. Currently only
- * deals with the empty v2 hierachy as we do not retrieve enabled controllers.
+ * deals with the empty v2 hierarchy as we do not retrieve enabled controllers.
*/
static bool cgv2_init(uid_t uid, gid_t gid)
{
From 367c1491b43024d855055fb298a5dd94ec3f8a61 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:09:02 +0000
Subject: [PATCH 26/59] spelling: hoops
---
src/lxc/raw_syscalls.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/raw_syscalls.c b/src/lxc/raw_syscalls.c
index e5e8235409..4ac51ac253 100644
--- a/src/lxc/raw_syscalls.c
+++ b/src/lxc/raw_syscalls.c
@@ -35,7 +35,7 @@ int lxc_raw_execveat(int dirfd, const char *pathname, char *const argv[],
pid_t lxc_raw_clone(unsigned long flags)
{
/*
- * These flags don't interest at all so we don't jump through any hoopes
+ * These flags don't interest at all so we don't jump through any hoops
* of retrieving them and passing them to the kernel.
*/
errno = EINVAL;
From 5f043f31c3057965546504c8e47688b3cdf8288f Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:11:19 +0000
Subject: [PATCH 27/59] spelling: ifindices
---
src/lxc/cmd/lxc_user_nic.c | 2 +-
src/lxc/network.c | 6 +++---
src/lxc/start.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lxc/cmd/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c
index 02915b882f..0ff4184974 100644
--- a/src/lxc/cmd/lxc_user_nic.c
+++ b/src/lxc/cmd/lxc_user_nic.c
@@ -1319,7 +1319,7 @@ int main(int argc, char *argv[])
_exit(EXIT_FAILURE);
}
- /* Write names of veth pairs and their ifindeces to stout:
+ /* Write names of veth pairs and their ifindices to stout:
* (e.g. eth0:731:veth9MT2L4:730)
*/
fprintf(stdout, "%s:%d:%s:%d\n", newname, container_veth_ifidx, nicname,
diff --git a/src/lxc/network.c b/src/lxc/network.c
index d7cc0f6d04..d0f14e6323 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -2421,7 +2421,7 @@ bool lxc_delete_network_unpriv(struct lxc_handler *handler)
netdev->link);
clear_ifindices:
- /* We need to clear any ifindeces we recorded so liblxc won't
+ /* We need to clear any ifindices we recorded so liblxc won't
* have cached stale data which would cause it to fail on reboot
* we're we don't re-read the on-disk config file.
*/
@@ -2632,7 +2632,7 @@ bool lxc_delete_network_priv(struct lxc_handler *handler)
hostveth, netdev->link);
clear_ifindices:
- /* We need to clear any ifindeces we recorded so liblxc won't
+ /* We need to clear any ifindices we recorded so liblxc won't
* have cached stale data which would cause it to fail on reboot
* we're we don't re-read the on-disk config file.
*/
@@ -3131,7 +3131,7 @@ int lxc_network_send_name_and_ifindex_to_parent(struct lxc_handler *handler)
return -1;
}
- TRACE("Sent network device names and ifindeces to parent");
+ TRACE("Sent network device names and ifindices to parent");
return 0;
}
diff --git a/src/lxc/start.c b/src/lxc/start.c
index 583ba89839..25368c4e03 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1913,7 +1913,7 @@ static int lxc_spawn(struct lxc_handler *handler)
}
/* Now all networks are created, network devices are moved into place,
- * and the correct names and ifindeces in the respective namespaces have
+ * and the correct names and ifindices in the respective namespaces have
* been recorded. The corresponding structs have now all been filled. So
* log them for debugging purposes.
*/
From 9f9f30313304e4f9fe7ccc746a166abdd93e0ed2 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:11:52 +0000
Subject: [PATCH 28/59] spelling: implementations
---
src/lxc/commands.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 1d3c2eaef8..133384d723 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -348,7 +348,7 @@ int lxc_try_cmd(const char *name, const char *lxcpath)
return 0;
}
-/* Implentations of the commands and their callbacks */
+/* Implementations of the commands and their callbacks */
/*
* lxc_cmd_get_init_pid: Get pid of the container's init process
From f6670f460c33d8369b0ac425b0cb18fdd0ff2874 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:12:08 +0000
Subject: [PATCH 29/59] spelling: indefinitely
---
doc/api-extensions.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/api-extensions.md b/doc/api-extensions.md
index f071237e06..ae9cced1cb 100644
--- a/doc/api-extensions.md
+++ b/doc/api-extensions.md
@@ -25,7 +25,7 @@ an efficient ringbuffer.
This adds `reboot2()` as a new API extension. This function properly waits
until a reboot succeeded. It takes a timeout argument. When set to `> 0`
`reboot2()` will block until the timeout is reached, if timeout is set to zero
-`reboot2()` will not block, if set to -1 `reboot2()` will block indefinitly.
+`reboot2()` will not block, if set to -1 `reboot2()` will block indefinitely.
## mount\_injection
From 9faabd1cf31578e32b24e1588af2b19d47e322cd Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:12:26 +0000
Subject: [PATCH 30/59] spelling: inherited
---
src/lxc/conf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 1905fd156a..e441d52323 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1397,7 +1397,7 @@ int lxc_chroot(const struct lxc_rootfs *rootfs)
return -1;
}
- /* The following code cleans up inhereted mounts which are not required
+ /* The following code cleans up inherited mounts which are not required
* for CT.
*
* The mountinfo file shows not all mounts, if a few points have been
From 03de195dca5de12639924091385ea96d833ed9f7 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:13:17 +0000
Subject: [PATCH 31/59] spelling: initialize
---
src/lxc/list.h | 2 +-
src/lxc/log.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/list.h b/src/lxc/list.h
index e3d409f2f4..2ab9e1f047 100644
--- a/src/lxc/list.h
+++ b/src/lxc/list.h
@@ -63,7 +63,7 @@ struct lxc_list {
for (__iterator = (__list)->next, __next = __iterator->next; \
__iterator != __list; __iterator = __next, __next = __next->next)
-/* Initalize list. */
+/* Initialize list. */
static inline void lxc_list_init(struct lxc_list *list)
{
list->elem = NULL;
diff --git a/src/lxc/log.c b/src/lxc/log.c
index f240af8ac8..71e0618c78 100644
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -640,7 +640,7 @@ static int _lxc_log_set_file(const char *name, const char *lxcpath, int create_d
/*
* lxc_log_init:
* Called from lxc front-end programs (like lxc-create, lxc-start) to
- * initalize the log defaults.
+ * initialize the log defaults.
*/
int lxc_log_init(struct lxc_log *log)
{
From 928fe2815eb8d69db87c17f8860b13a975c715cf Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:16:39 +0000
Subject: [PATCH 32/59] spelling: javascript
---
doc/api/Doxyfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/api/Doxyfile b/doc/api/Doxyfile
index 59180f817e..19ad4cd923 100644
--- a/doc/api/Doxyfile
+++ b/doc/api/Doxyfile
@@ -258,7 +258,7 @@ OPTIMIZE_OUTPUT_VHDL = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
# (default is Fortran), use: inc=Fortran f=C.
@@ -1392,7 +1392,7 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
+# http://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using prerendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1462,7 +1462,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavours of web server based searching depending on the
# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
# searching and an index file used by the script. When EXTERNAL_SEARCH is
From 854bd327cdd36cd9f9587cd8dcfd3a45ea92afa6 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:17:22 +0000
Subject: [PATCH 33/59] spelling: keepdata
---
src/lxc/tools/lxc_copy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/tools/lxc_copy.c b/src/lxc/tools/lxc_copy.c
index 76af226462..954f1dd2d0 100644
--- a/src/lxc/tools/lxc_copy.c
+++ b/src/lxc/tools/lxc_copy.c
@@ -117,7 +117,7 @@ Options :\n\
-t, --tmpfs place ephemeral container on a tmpfs\n\
(WARNING: On reboot all changes made to the container will be lost.)\n\
-L, --fssize size of the new block device for block device containers\n\
- -D, --keedata pass together with -e start a persistent snapshot \n\
+ -D, --keepdata pass together with -e start a persistent snapshot \n\
-K, --keepname keep the hostname of the original container\n\
-- hook options arguments passed to the hook program\n\
-M, --keepmac keep the MAC address of the original container\n\
From 8d7ef96b27c0e383889c9c37bc384de85f47e949 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:18:08 +0000
Subject: [PATCH 34/59] spelling: libraries
---
CONTRIBUTING | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 55cad4b4db..c40aed6d23 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -40,7 +40,7 @@ imported into LXC).
Language bindings for the libraries need to be released under LGPLv2.1+.
-Anything else (non-libaries) needs to be Free Software and needs to be
+Anything else (non-libraries) needs to be Free Software and needs to be
allowed to link with LGPLv2.1+ code (if needed). LXC upstream prefers
LGPLv2.1+ or GPLv2 for those.
From 0f699ec9f6e5d3266f406da4301303a194db7260 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:18:45 +0000
Subject: [PATCH 35/59] spelling: loglevel
---
src/lxc/conf.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index befadc8cd9..0e2c726eb3 100644
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -306,7 +306,7 @@ struct lxc_conf {
int stopsignal; /* signal used to hard stop container */
char *rcfile; /* Copy of the top level rcfile we read */
- /* Logfile and logleve can be set in a container config file. Those
+ /* Logfile and loglevel can be set in a container config file. Those
* function as defaults. The defaults can be overriden by command line.
* However we don't want the command line specified values to be saved
* on c->save_config(). So we store the config file specified values
From 0824487e8499a19b902ebe4185f34a5be1a51c18 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:26:07 +0000
Subject: [PATCH 36/59] spelling: namespace
---
doc/ko/lxc.container.conf.sgml.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/ko/lxc.container.conf.sgml.in b/doc/ko/lxc.container.conf.sgml.in
index e880525a6b..39fe01edce 100644
--- a/doc/ko/lxc.container.conf.sgml.in
+++ b/doc/ko/lxc.container.conf.sgml.in
@@ -348,7 +348,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
<listitem>
<para>
<!--
- UID to use within a private user namesapce for init.
+ UID to use within a private user namespace for init.
-->
init이 사용자 네임스페이스 안에서 사용할 UID.
</para>
@@ -361,7 +361,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
<listitem>
<para>
<!--
- GID to use within a private user namesapce for init.
+ GID to use within a private user namespace for init.
-->
init이 사용자 네임스페이스 안에서 사용할 GID.
</para>
From 4e9ddbc8425571b3b6c5f4731838d5cf23082bd5 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:35:39 +0000
Subject: [PATCH 37/59] spelling: otherwise
---
doc/ja/lxc.container.conf.sgml.in | 2 +-
doc/ko/lxc.container.conf.sgml.in | 2 +-
doc/lxc.container.conf.sgml.in | 2 +-
src/lxc/criu.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in
index cb9a8a7603..8e2b47af8a 100644
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -2272,7 +2272,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
container should be run can be specified in the container
configuration. The default is <command>lxc-container-default-cgns</command>
if the host kernel is cgroup namespace aware, or
- <command>lxc-container-default</command> othewise.
+ <command>lxc-container-default</command> otherwise.
-->
lxc が apparmor サポートでコンパイルされ、インストールされている場合で、ホストで apparmor が有効な場合、コンテナが従って動くべき apparmor プロファイルは、コンテナの設定で指定することが可能です。
デフォルトは、ホストのカーネルで cgroup 名前空間が使える場合は <command>lxc-container-default-cgns</command>です。使えない場合は <command>lxc-container-default</command> です。
diff --git a/doc/ko/lxc.container.conf.sgml.in b/doc/ko/lxc.container.conf.sgml.in
index 39fe01edce..198812f93a 100644
--- a/doc/ko/lxc.container.conf.sgml.in
+++ b/doc/ko/lxc.container.conf.sgml.in
@@ -1623,7 +1623,7 @@ proc proc proc nodev,noexec,nosuid 0 0
container should be run can be specified in the container
configuration. The default is <command>lxc-container-default-cgns</command>
if the host kernel is cgroup namespace aware, or
- <command>lxc-container-default</command> othewise.
+ <command>lxc-container-default</command> otherwise.
-->
lxc가 apparmor를 지원하도록 컴파일된 후 설치되었고, 호스트 시스템에서 apparmor가 활성화되었다면, 컨테이너에서 따라야할 apparmor 프로파일을 컨테이너 설정에서 지정할 수 있다. 기본값은 호스트 커널이 cgroup 네임스페이스를 지원하면 <command>lxc-container-default-cgns</command>이고, 그렇지 않다면 <command>lxc-container-default</command>이다.
</para>
diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
index 0a20e06dbc..91a7355a0c 100644
--- a/doc/lxc.container.conf.sgml.in
+++ b/doc/lxc.container.conf.sgml.in
@@ -1705,7 +1705,7 @@ dev/null proc/kcore none bind,relative 0 0
container should be run can be specified in the container
configuration. The default is <command>lxc-container-default-cgns</command>
if the host kernel is cgroup namespace aware, or
- <command>lxc-container-default</command> othewise.
+ <command>lxc-container-default</command> otherwise.
</para>
<variablelist>
<varlistentry>
diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index c40e93a713..3d857b5419 100644
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -952,7 +952,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
struct cgroup_ops *cgroup_ops;
/* Try to detach from the current controlling tty if it exists.
- * Othwerise, lxc_init (via lxc_console) will attach the container's
+ * Otherwise, lxc_init (via lxc_console) will attach the container's
* console output to the current tty, which is probably not what any
* library user wants, and if they do, they can just manually configure
* it :)
From 2807dc99a89b986b57f00fe3e56522bc32e0a321 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:36:14 +0000
Subject: [PATCH 38/59] spelling: output
---
src/lxc/conf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index e441d52323..52ec8731b8 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3040,7 +3040,7 @@ int lxc_map_ids(struct lxc_list *idmap, pid_t pid)
if (!had_entry)
continue;
- /* Try to catch the ouput of new{g,u}idmap to make debugging
+ /* Try to catch the output of new{g,u}idmap to make debugging
* easier.
*/
if (use_shadow) {
From 669e521220cdc88aa8c1093263da9a171b9ed2d8 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:37:13 +0000
Subject: [PATCH 39/59] spelling: overlayfs
---
doc/ko/lxc-copy.sgml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/ko/lxc-copy.sgml.in b/doc/ko/lxc-copy.sgml.in
index 712550d9b1..c0f357a799 100644
--- a/doc/ko/lxc-copy.sgml.in
+++ b/doc/ko/lxc-copy.sgml.in
@@ -137,7 +137,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
container. aufs or overlayfs snapshots of directory backed containers are
exempted from this rule.
-->
- 복사본의 저장소는 원본 컨테이너와 같은 종류가 된다. 단, aufs나 디렉토리로 구성된 컨테이너의 overayfs 스냅샷은 예외이다.
+ 복사본의 저장소는 원본 컨테이너와 같은 종류가 된다. 단, aufs나 디렉토리로 구성된 컨테이너의 overlayfs 스냅샷은 예외이다.
</para>
<para>
From 2322be0d9b4f380258e727fdc3045168e0cea28a Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:37:31 +0000
Subject: [PATCH 40/59] spelling: overridden
---
src/lxc/conf.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index 0e2c726eb3..4e2c790590 100644
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -307,7 +307,7 @@ struct lxc_conf {
char *rcfile; /* Copy of the top level rcfile we read */
/* Logfile and loglevel can be set in a container config file. Those
- * function as defaults. The defaults can be overriden by command line.
+ * function as defaults. The defaults can be overridden by command line.
* However we don't want the command line specified values to be saved
* on c->save_config(). So we store the config file specified values
* here. */
From 9f84ff9e0e3b4380ec6f9f339db13cc369925d34 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:44:56 +0000
Subject: [PATCH 41/59] spelling: override
---
hooks/dhclient-script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hooks/dhclient-script b/hooks/dhclient-script
index 171117fd28..9b4c0f0ffd 100644
--- a/hooks/dhclient-script
+++ b/hooks/dhclient-script
@@ -32,7 +32,7 @@
# Resolve every paths against the $ROOTFS environment variable.
# 'ip' just looks too weird. Also, we now have unit-tests! Those unit-tests
-# overwirte this line to use a fake ip-echo tool. It's also convenient
+# override this line to use a fake ip-echo tool. It's also convenient
# if your system holds ip tool in a non-standard location.
ip=/sbin/ip
From 6ba8b67295f92fad9c1f46386d57363e992870fb Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:45:15 +0000
Subject: [PATCH 42/59] spelling: passphrase
---
hooks/mountecryptfsroot | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hooks/mountecryptfsroot b/hooks/mountecryptfsroot
index 15bb2ea170..cb5a66b140 100755
--- a/hooks/mountecryptfsroot
+++ b/hooks/mountecryptfsroot
@@ -39,7 +39,7 @@
# container as normal.
# a. echo none | ecryptfs-add-passphrase
# b. lxc-start -n q1
-# Note that you may well want to use a wrapped passhrase (see the ecryptfs-wrap-passphrase(1) manual page).
+# Note that you may well want to use a wrapped passphrase (see the ecryptfs-wrap-passphrase(1) manual page).
set -e
ecryptfs_crypt=$(echo $LXC_ROOTFS_PATH | sed 's/rootfs$/rootfs.crypt/')
From bb5eb187152ffe1367a56ea802f1b22373023f53 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:47:17 +0000
Subject: [PATCH 43/59] spelling: perhaps
---
src/tests/aa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/aa.c b/src/tests/aa.c
index 8419d3b470..7a83e8e17f 100644
--- a/src/tests/aa.c
+++ b/src/tests/aa.c
@@ -57,7 +57,7 @@ static int test_attach_write_file(void* payload)
/*
* try opening a file attached to a container. Return 0 on open fail. Return
- * 1 if the file open succeeded. Return -1 if attach itself failed - perhas an
+ * 1 if the file open succeeded. Return -1 if attach itself failed - perhaps an
* older kernel.
*/
static int do_test_file_open(struct lxc_container *c, char *fnam)
From ba642701a86b4d5d9784a5cb88fd2850c8cad342 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:47:48 +0000
Subject: [PATCH 44/59] spelling: pertains
---
doc/ja/lxc-usernsexec.sgml.in | 2 +-
doc/ko/lxc-usernsexec.sgml.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/ja/lxc-usernsexec.sgml.in b/doc/ja/lxc-usernsexec.sgml.in
index 4125ad393e..88c9530b15 100644
--- a/doc/ja/lxc-usernsexec.sgml.in
+++ b/doc/ja/lxc-usernsexec.sgml.in
@@ -88,7 +88,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<!--
The uid map to use in the user namespace. Each map consists of
four colon-separate values. First a character 'u', 'g' or 'b' to
- specify whether this map perttains to user ids, group ids, or
+ specify whether this map pertains to user ids, group ids, or
both; next the first userid in the user namespace; next the
first userid as seen on the host; and finally the number of
ids to be mapped.
diff --git a/doc/ko/lxc-usernsexec.sgml.in b/doc/ko/lxc-usernsexec.sgml.in
index 9568f14e9e..72b75506fe 100644
--- a/doc/ko/lxc-usernsexec.sgml.in
+++ b/doc/ko/lxc-usernsexec.sgml.in
@@ -88,7 +88,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
<!--
The uid map to use in the user namespace. Each map consists of
four colon-separate values. First a character 'u', 'g' or 'b' to
- specify whether this map perttains to user ids, group ids, or
+ specify whether this map pertains to user ids, group ids, or
both; next the first userid in the user namespace; next the
first userid as seen on the host; and finally the number of
ids to be mapped.
From 093c6ce7849d784a6e314823a958275f7a051d00 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:48:55 +0000
Subject: [PATCH 45/59] spelling: portion
---
src/lxc/conf.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index 4e2c790590..72441538e8 100644
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -160,7 +160,7 @@ struct lxc_tty_info {
* @bev_type : optional backing store type
* @options : mount options
* @mountflags : the portion of @options that are flags
- * @data : the porition of @options that are not flags
+ * @data : the portion of @options that are not flags
* @managed : whether it is managed by LXC
*/
struct lxc_rootfs {
From a6235423044aea0f16215b8a0d11ba4cc00285c6 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:56:15 +0000
Subject: [PATCH 46/59] spelling: potentially
---
src/lxc/attach.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index 9464d882e3..117e3778fa 100644
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -1219,7 +1219,7 @@ int lxc_attach(const char *name, const char *lxcpath,
* just fork()s away without exec'ing directly after, the socket fd will
* exist in the forked process from the other thread and any close() in
* our own child process will not really cause the socket to close
- * properly, potentiall causing the parent to hang.
+ * properly, potentially causing the parent to hang.
*
* For this reason, while IPC is still active, we have to use shutdown()
* if the child exits prematurely in order to signal that the socket is
From 94f6ab00f2b71efdacf9c4b8eb9cfc7972217870 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 08:02:42 +0000
Subject: [PATCH 47/59] spelling: returns
---
src/lxc/tools/lxc_unshare.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/tools/lxc_unshare.c b/src/lxc/tools/lxc_unshare.c
index cc00dc0dff..a86d12b3c7 100644
--- a/src/lxc/tools/lxc_unshare.c
+++ b/src/lxc/tools/lxc_unshare.c
@@ -472,6 +472,6 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
- /* Call exit() directly on this function because it retuns an exit code. */
+ /* Call exit() directly on this function because it returns an exit code. */
exit(EXIT_SUCCESS);
}
From 88875d272b53795037b406e529e3e83aa6962d8e Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 07:59:43 +0000
Subject: [PATCH 48/59] spelling: root
---
src/lxc/storage/btrfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/storage/btrfs.c b/src/lxc/storage/btrfs.c
index b850611dcb..bbfce61b9f 100644
--- a/src/lxc/storage/btrfs.c
+++ b/src/lxc/storage/btrfs.c
@@ -831,7 +831,7 @@ static int btrfs_recursive_destroy(const char *path)
/*
* A backref key with the name and dirid of the parent
- * comes followed by the reoot ref key which has the
+ * comes followed by the root ref key which has the
* name of the child subvol in question.
*/
if (sh.objectid != root_id && sh.type == BTRFS_ROOT_BACKREF_KEY) {
From 283811c2a6b541d79b3f47015c96dcdb97a5654a Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 08:03:58 +0000
Subject: [PATCH 49/59] spelling: securityfs
---
src/tests/lxc-test-apparmor-mount | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount
index 56d598f4cd..d21c948223 100755
--- a/src/tests/lxc-test-apparmor-mount
+++ b/src/tests/lxc-test-apparmor-mount
@@ -88,7 +88,7 @@ chmod 0666 "$logfile"
# This would be much simpler if we could run it as
# root. However, in order to not have the bind mount
-# of an empty directory over the securitfs 'mount' directory
+# of an empty directory over the securityfs 'mount' directory
# be removed, we need to do this as non-root.
which newuidmap >/dev/null 2>&1 || { echo "'newuidmap' command is missing" >&2; exit 1; }
From 66607dc81e4153b268e171b7bb7de6c12bcb347e Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 08:09:19 +0000
Subject: [PATCH 50/59] spelling: snapshotting
---
src/lxc/storage/storage.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/storage/storage.c b/src/lxc/storage/storage.c
index 0a93a4d34b..c4f4c2ea30 100644
--- a/src/lxc/storage/storage.c
+++ b/src/lxc/storage/storage.c
@@ -314,7 +314,7 @@ bool storage_can_backup(struct lxc_conf *conf)
return ret;
}
-/* If we're not snaphotting, then storage_copy becomes a simple case of mount
+/* If we're not snapshotting, then storage_copy becomes a simple case of mount
* the original, mount the new, and rsync the contents.
*/
struct lxc_storage *storage_copy(struct lxc_container *c, const char *cname,
From bcb8894172d5173731cae7de00a99126d4e94e29 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 08:09:37 +0000
Subject: [PATCH 51/59] spelling: specified
---
src/lxc/conf.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index 72441538e8..f40807e9a3 100644
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -311,8 +311,8 @@ struct lxc_conf {
* However we don't want the command line specified values to be saved
* on c->save_config(). So we store the config file specified values
* here. */
- char *logfile; /* the logfile as specifed in config */
- int loglevel; /* loglevel as specifed in config (if any) */
+ char *logfile; /* the logfile as specified in config */
+ int loglevel; /* loglevel as specified in config (if any) */
int logfd;
unsigned int start_auto;
From ac24d0db0ddc86f5abd89f8a2419108e2c090867 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 08:09:44 +0000
Subject: [PATCH 52/59] spelling: specify
---
src/lxc/conf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 52ec8731b8..a5dc9b9fe6 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -4359,7 +4359,7 @@ struct lxc_list *get_minimal_idmap(struct lxc_conf *conf)
* This means we require only to establish a mapping from:
* - the container root {g,u}id as seen from the host > user's host {g,u}id
* - the container root -> some sub{g,u}id
- * The former we add, if the user did not specifiy a mapping. The latter we
+ * The former we add, if the user did not specify a mapping. The latter we
* retrieve from the container's configured {g,u}id mappings as it must have been
* there to start the container in the first place.
*/
From 9cc513baefb0c0cc2f45e1d10d0949e2ddc0b19e Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 08:11:56 +0000
Subject: [PATCH 53/59] spelling: subtracting
---
src/lxc/log.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/log.c b/src/lxc/log.c
index 71e0618c78..2f1a9385e1 100644
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -258,13 +258,13 @@ static int lxc_unix_epoch_to_utc(char *buf, size_t bufsize, const struct timespe
/* Transform hours to seconds. */
h_in_s = hours * 3600;
- /* Calculate minutes by substracting the seconds for all days in the
+ /* Calculate minutes by subtracting the seconds for all days in the
* epoch and for all hours in the epoch and divide by the number of
* minutes in an hour.
*/
minutes = (time->tv_sec - d_in_s - h_in_s) / 60;
- /* Calculate the seconds by substracting the seconds for all days in the
+ /* Calculate the seconds by subtracting the seconds for all days in the
* epoch, hours in the epoch and minutes in the epoch.
*/
seconds = (time->tv_sec - d_in_s - h_in_s - (minutes * 60));
From 0d7b7256804d5805947b175e055458a59743f2b0 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 08:12:07 +0000
Subject: [PATCH 54/59] spelling: successfully
---
src/tests/shortlived.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/shortlived.c b/src/tests/shortlived.c
index da2f04f769..5c3d275482 100644
--- a/src/tests/shortlived.c
+++ b/src/tests/shortlived.c
@@ -238,7 +238,7 @@ int main(int argc, char *argv[])
/* Test whether we can start a really short-lived daemonized container with lxc-init. */
for (i = 0; i < 10; i++) {
/* An container started with lxc-init will always start
- * succesfully unless lxc-init has a bug.
+ * successfully unless lxc-init has a bug.
*/
if (!c->startl(c, 1, NULL)) {
fprintf(stderr, "%d: %s failed to start on %dth iteration\n", __LINE__, c->name, i);
From 4d5b621c9a62e2cdc6eeaafb962736998b0fe202 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 08:12:17 +0000
Subject: [PATCH 55/59] spelling: syscall
---
doc/ja/lxc.container.conf.sgml.in | 2 +-
doc/ko/lxc.container.conf.sgml.in | 2 +-
doc/lxc.container.conf.sgml.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in
index 8e2b47af8a..47ef1c6ef2 100644
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -2388,7 +2388,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
Versions 1 and 2 are currently supported. In version 1, the
policy is a simple whitelist. The second line therefore must
read "whitelist", with the rest of the file containing one (numeric)
- sycall number per line. Each syscall number is whitelisted,
+ syscall number per line. Each syscall number is whitelisted,
while every unlisted number is blacklisted for use in the container
-->
現時点では、バージョン番号は 1 と 2 をサポートしています。バージョン 1 では、ポリシーはシンプルなホワイトリストですので、2 行目は "whitelist" でなければなりません。
diff --git a/doc/ko/lxc.container.conf.sgml.in b/doc/ko/lxc.container.conf.sgml.in
index 198812f93a..b72c88122a 100644
--- a/doc/ko/lxc.container.conf.sgml.in
+++ b/doc/ko/lxc.container.conf.sgml.in
@@ -1738,7 +1738,7 @@ proc proc proc nodev,noexec,nosuid 0 0
Versions 1 and 2 are currently supported. In version 1, the
policy is a simple whitelist. The second line therefore must
read "whitelist", with the rest of the file containing one (numeric)
- sycall number per line. Each syscall number is whitelisted,
+ syscall number per line. Each syscall number is whitelisted,
while every unlisted number is blacklisted for use in the container
-->
현재는 버전1과 2만 지원된다. 버전 1에서는 정책은 단순한 화이트리스트이다. 그러므로 두번째 라인은 반드시 "whitelist"여야 한다. 파일의 나머지 내용은 한 줄에 하나의 시스템콜 번호로 채워진다. 화이트리스트에 없는 번호는 컨테이너에서 블랙리스트로 들어간다.
diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
index 91a7355a0c..3db43fa9ab 100644
--- a/doc/lxc.container.conf.sgml.in
+++ b/doc/lxc.container.conf.sgml.in
@@ -1790,7 +1790,7 @@ dev/null proc/kcore none bind,relative 0 0
Versions 1 and 2 are currently supported. In version 1, the
policy is a simple whitelist. The second line therefore must
read "whitelist", with the rest of the file containing one (numeric)
- sycall number per line. Each syscall number is whitelisted,
+ syscall number per line. Each syscall number is whitelisted,
while every unlisted number is blacklisted for use in the container
</para>
From c205f56efa86398e864731280b9e8442eb4a4d0c Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 08:14:58 +0000
Subject: [PATCH 56/59] spelling: timeout
---
config/init/common/lxc-containers.in | 2 +-
config/init/upstart/lxc.conf.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/init/common/lxc-containers.in b/config/init/common/lxc-containers.in
index bebbbfaf47..3779d83b30 100644
--- a/config/init/common/lxc-containers.in
+++ b/config/init/common/lxc-containers.in
@@ -97,7 +97,7 @@ case "$1" in
# The stop is serialized and can take excessive time. We need to avoid
# delaying the system shutdown / reboot as much as we can since it's not
- # parallelized... Even 5 second timout may be too long.
+ # parallelized... Even 5 second timeout may be too long.
"$bindir"/lxc-autostart $STOPOPTS $SHUTDOWNDELAY
;;
diff --git a/config/init/upstart/lxc.conf.in b/config/init/upstart/lxc.conf.in
index 437db3ce5f..3bdfdf718c 100644
--- a/config/init/upstart/lxc.conf.in
+++ b/config/init/upstart/lxc.conf.in
@@ -61,7 +61,7 @@ end script
# The stop is serialized and can take excessive time. We need to avoid
# delaying the system shutdown / reboot as much as we can since it's not
-# parallelized... Even 5 second timout may be too long.
+# parallelized... Even 5 second timeout may be too long.
post-stop script
[ -f /etc/default/lxc ] && . /etc/default/lxc
From 98e03ef38b9d3f4255f59fdbb9d6ddf8e0e2a3a9 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 08:24:51 +0000
Subject: [PATCH 57/59] spelling: unsigned
---
src/lxc/confile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 45095855ae..5ecbaeac2f 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -4434,7 +4434,7 @@ static struct lxc_config_t *get_network_config_ops(const char *key,
ret = lxc_safe_uint((idx_start + 1), &tmpidx);
if (ret < 0) {
errno = -ret;
- SYSERROR("Failed to parse usigned integer from string \"%s\"",
+ SYSERROR("Failed to parse unsigned integer from string \"%s\"",
idx_start + 1);
*idx = ret;
goto on_error;
From 77c622773b0a1874b043077ec4028f7524471f15 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 08:19:23 +0000
Subject: [PATCH 58/59] spelling: userns
---
src/lxc/conf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index a5dc9b9fe6..fbf569b0f7 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1404,7 +1404,7 @@ int lxc_chroot(const struct lxc_rootfs *rootfs)
* unmounted between read operations from the mountinfo. So we need to
* read mountinfo a few times.
*
- * This loop can be skipped if a container uses unserns, because all
+ * This loop can be skipped if a container uses userns, because all
* inherited mounts are locked and we should live with all this trash.
*/
for (;;) {
@@ -1447,7 +1447,7 @@ int lxc_chroot(const struct lxc_rootfs *rootfs)
break;
}
- /* This also can be skipped if a container uses unserns. */
+ /* This also can be skipped if a container uses userns. */
(void)umount2("./proc", MNT_DETACH);
/* It is weird, but chdir("..") moves us in a new root */
From 23ca8d8e51594c1fa133adf1d4f52ac46a8aa43b Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref at users.noreply.github.com>
Date: Tue, 30 Oct 2018 08:26:30 +0000
Subject: [PATCH 59/59] spelling: without
---
doc/examples/lxc-empty-netns.conf.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/examples/lxc-empty-netns.conf.in b/doc/examples/lxc-empty-netns.conf.in
index f28dff5d59..4564cbd0c5 100644
--- a/doc/examples/lxc-empty-netns.conf.in
+++ b/doc/examples/lxc-empty-netns.conf.in
@@ -1,4 +1,4 @@
-# Container with new network withtout network devices
+# Container with new network without network devices
lxc.uts.name = omega
lxc.net.0.type = empty
lxc.net.0.flags = up
More information about the lxc-devel
mailing list