The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/1846
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) ===
From 1e074e8ebec83a77176eae51736f1ff7e8052a89 Mon Sep 17 00:00:00 2001 From: KATOH Yasufumi <ka...@jazz.email.ne.jp> Date: Fri, 6 Oct 2017 19:23:48 +0900 Subject: [PATCH 1/2] doc: Add lxc.hook.start-host to Japanese lxc.container.conf(5) Update for commit 08dd280543e1013dc1a47176167a9572b5450eb8 Signed-off-by: KATOH Yasufumi <ka...@jazz.email.ne.jp> --- doc/ja/lxc.container.conf.sgml.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in index 86c8fec53..a82fc93db 100644 --- a/doc/ja/lxc.container.conf.sgml.in +++ b/doc/ja/lxc.container.conf.sgml.in @@ -2096,6 +2096,23 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> <variablelist> <varlistentry> <term> + <option>lxc.hook.start-host</option> + </term> + <listitem> + <para> + <!-- + A hook to be run in the host's namespace after the + container has been setup, and immediately before starting + the container init. + --> + コンテナのセットアップが済んだあと、コンテナの init を実行する直前に、ホストの名前空間で実行するためのフックです。 + </para> + </listitem> + </varlistentry> + </variablelist> + <variablelist> + <varlistentry> + <term> <option>lxc.hook.start</option> </term> <listitem> From fcd95ae926eb10a785d77112219272d7b9c5b494 Mon Sep 17 00:00:00 2001 From: KATOH Yasufumi <ka...@jazz.email.ne.jp> Date: Fri, 6 Oct 2017 19:40:53 +0900 Subject: [PATCH 2/2] doc: Update lxc.{execute,init}.cmd in lxc.container.conf(5) * Add lxc.execute.cmd to Japanese lxc.container.conf(5) * Tweak the description of the "INIT COMMAND" section and lxc.init.cmd in en and ja man pages. Signed-off-by: KATOH Yasufumi <ka...@jazz.email.ne.jp> --- doc/ja/lxc.container.conf.sgml.in | 27 +++++++++++++++++++-------- doc/lxc.container.conf.sgml.in | 9 +++------ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in index a82fc93db..525e2d551 100644 --- a/doc/ja/lxc.container.conf.sgml.in +++ b/doc/ja/lxc.container.conf.sgml.in @@ -337,26 +337,37 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp> <para> <!-- Sets the command to use as the init system for the containers. - - This option is ignored when using lxc-execute. - - Defaults to: /sbin/init --> コンテナの init として使うコマンドを設定します。 - このオプションは lxc-execute では無視されます。 - デフォルトは /sbin/init です。 </para> <variablelist> <varlistentry> <term> + <option>lxc.execute.cmd</option> + </term> + <listitem> + <para> + <!-- + Absolute path from container rootfs to the binary to run by default. This + mostly makes sense for lxc-execute. + --> + デフォルトで実行するバイナリのコンテナの root からの絶対パスを指定します。これは <command>lxc-execute</command> のための設定です。 + </para> + </listitem> + </varlistentry> + </variablelist> + <variablelist> + <varlistentry> + <term> <option>lxc.init.cmd</option> </term> <listitem> <para> <!-- - Absolute path from container rootfs to the binary to use as init. + Absolute path from container rootfs to the binary to use as init. This + mostly makes sense for lxc-start. Default is /sbin/init. --> - init として使うバイナリの、コンテナの rootfs からの絶対パスを指定します。 + init として使うバイナリの、コンテナの root からの絶対パスを指定します。これは <command>lxc-start</command> のための設定です。デフォルトは <command>/sbin/init</command> です。 </para> </listitem> </varlistentry> diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in index 3f05e52b6..059942bc9 100644 --- a/doc/lxc.container.conf.sgml.in +++ b/doc/lxc.container.conf.sgml.in @@ -255,10 +255,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA <title>Init command</title> <para> Sets the command to use as the init system for the containers. - - This option is ignored when using lxc-execute. - - Defaults to: /sbin/init </para> <variablelist> <varlistentry> @@ -268,7 +264,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA <listitem> <para> Absolute path from container rootfs to the binary to run by default. This - mostly makes sense for lxc-execute. + mostly makes sense for <command>lxc-execute</command>. </para> </listitem> </varlistentry> @@ -280,7 +276,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA </term> <listitem> <para> - Absolute path from container rootfs to the binary to use as init. + Absolute path from container rootfs to the binary to use as init. This + mostly makes sense for <command>lxc-start</command>. Default is <command>/sbin/init</command>. </para> </listitem> </varlistentry>
_______________________________________________ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel