The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/3462
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
* descriptions of vlan bridge options
* lxc.time.offset.{boot,monotonic}
From 6fcaba055997f89cddd47a910d564291f7ba7303 Mon Sep 17 00:00:00 2001
From: KATOH Yasufumi <ka...@jazz.email.ne.jp>
Date: Fri, 26 Jun 2020 14:10:03 +0900
Subject: [PATCH 1/2] doc: Add veth vlan bridge options to Japanese
lxc.container.conf(5)
Update for commit a789ca4c24190f903d80b077b3cae766e932b2ad
Signed-off-by: KATOH Yasufumi <ka...@jazz.email.ne.jp>
---
doc/ja/lxc.container.conf.sgml.in | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/doc/ja/lxc.container.conf.sgml.in
b/doc/ja/lxc.container.conf.sgml.in
index 7a65e3fe4c..1e61ff0952 100644
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -619,6 +619,12 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<option>lxc.net.[i].veth.ipv6.route</option> options.
Several lines specify several routes.
The route is in format x.y.z.t/m, eg. 192.168.1.0/24.
+
+ In <option>bridge</option> mode untagged VLAN membership can be
set with the
+ <option>lxc.net.[i].veth.vlan.id</option> option. It accepts a
special value of 'none' indicating
+ that the container port should be removed from the bridge's
default untagged VLAN.
+ The <option>lxc.net.[i].veth.vlan.tagged.id</option> option can
be specified multiple times to set
+ the container's bridge port membership to one or more tagged
VLANs.
-->
<option>veth:</option>
一方がコンテナに、もう一方がホストに接続されるペアの仮想イーサネットデバイスを作成します。
<option>lxc.net.[i].veth.mode</option> は、veth
の親（ホスト側）がホスト上で使うモードを指定します。
@@ -636,6 +642,8 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<option>lxc.net.[i].veth.ipv4.route</option>、<option>lxc.net.[i].veth.ipv6.route</option>
オプションを使って、静的ルーティングをコンテナを指し示すホスト上に追加できます。
複数のルートがある場合は複数の設定を指定します。
ルートは x.y.z.t/m の形式です。例: 192.168.1.0/24
+
+ <option>bridge</option> モードでは、タグなし VLAN は
<option>lxc.net.[i].veth.vlan.id</option>
で設定できます。このオプションでは、コンテナポートをブリッジのデフォルトのタグなし VLAN から削除するための特別な値 'none'
が指定できます。コンテナのブリッジポートを複数のタグ付き VLAN
に所属させるために、<option>lxc.net.[i].veth.vlan.tagged.id</option> を複数回指定できます。
</para>
<para>
From bb144af237e973211f26deb49ad6ed6077178e2e Mon Sep 17 00:00:00 2001
From: KATOH Yasufumi <ka...@jazz.email.ne.jp>
Date: Fri, 26 Jun 2020 14:24:28 +0900
Subject: [PATCH 2/2] doc: Add lxc.time.offset.* to Japanese
lxc.container.conf(5)
and fix a type in English man page.
Update for commit 7fb5a8dfd2dcacd840921fcecdaad34cefad7a68
Signed-off-by: KATOH Yasufumi <ka...@jazz.email.ne.jp>
---
doc/ja/lxc.container.conf.sgml.in | 33 +++++++++++++++++++++++++++++++
doc/lxc.container.conf.sgml.in | 2 +-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/doc/ja/lxc.container.conf.sgml.in
b/doc/ja/lxc.container.conf.sgml.in
index 1e61ff0952..22cfe95f75 100644
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -2417,6 +2417,39 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term>
+ <option>lxc.time.offset.boot</option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ Specify a positive or negative offset for the boottime clock. The
+ format accepts hours (h), minutes (m), seconds (s),
+ milliseconds (ms), microseconds (us), and nanoseconds (ns).
+ -->
+
ブートタイム(boottime)クロックの正または負のオフセット値を指定します。フォーマットは、時(h)、分(m)、秒(s)、ミリ秒(ms)、マイクロ秒(us)、ナノ秒(ns)を指定できます。
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <option>lxc.time.offset.monotonic</option>
+ </term>
+ <listitem>
+ <para>
+ <!--
+ Specify a positive or negative offset for the montonic clock. The
+ format accepts hours (h), minutes (m), seconds (s),
+ milliseconds (ms), microseconds (us), and nanoseconds (ns).
+ -->
+
monotonicクロックの正または負のオフセット値を指定します。フォーマットは、時(h)、分(m)、秒(s)、ミリ秒(ms)、マイクロ秒(us)、ナノ秒(ns)を指定できます。
+ </para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</refsect2>
diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
index b81e1a6153..94200bacc0 100644
--- a/doc/lxc.container.conf.sgml.in
+++ b/doc/lxc.container.conf.sgml.in
@@ -1826,7 +1826,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA
</term>
<listitem>
<para>
- Specify a positive or negative offset for the montonic clock. The
+ Specify a positive or negative offset for the monotonic clock. The
format accepts hours (h), minutes (m), seconds (s),
milliseconds (ms), microseconds (us), and nanoseconds (ns).
</para>
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
