[lxc-devel] [PATCH] Add the use of 'attach' to lxc-start-ephemeral(1)
KATOH Yasufumi
karma at jazz.email.ne.jp
Wed Apr 1 16:56:03 UTC 2015
Update for commit 8158c05
Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
---
doc/ja/lxc-start-ephemeral.sgml.in | 8 +++++---
doc/lxc-start-ephemeral.sgml.in | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/doc/ja/lxc-start-ephemeral.sgml.in b/doc/ja/lxc-start-ephemeral.sgml.in
index eca2a8b..14cd061 100644
--- a/doc/ja/lxc-start-ephemeral.sgml.in
+++ b/doc/ja/lxc-start-ephemeral.sgml.in
@@ -209,10 +209,12 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
<para>
<!--
Immediately run the provided command in the container.
- This currently uses ssh (not attach) and is incompatible
- with daemon mode.
+ This uses attach if the kernel supports it, otherwise uses ssh.
+ This is incompatible with daemon mode.
-->
- 即座に指定したコマンドをコンテナ内で実行します。現時点では (attach ではなく) ssh を使用します。そしてデーモンモードと両方を指定することはできません。
+ 即座に指定したコマンドをコンテナ内で実行します。
+ コマンドを実行する際、カーネルがサポートしている場合は lxc-start-ephemeral は attach を使います。
+ カーネルがサポートしていない場合は ssh を使います。
</para>
</listitem>
</varlistentry>
diff --git a/doc/lxc-start-ephemeral.sgml.in b/doc/lxc-start-ephemeral.sgml.in
index d37ecf5..785d8fa 100644
--- a/doc/lxc-start-ephemeral.sgml.in
+++ b/doc/lxc-start-ephemeral.sgml.in
@@ -171,8 +171,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<listitem>
<para>
Immediately run the provided command in the container.
- This currently uses ssh (not attach) and is incompatible
- with daemon mode.
+ This uses attach if the kernel supports it, otherwise uses ssh.
+ This is incompatible with daemon mode.
</para>
</listitem>
</varlistentry>
--
1.9.5 (Apple Git-50.3)
More information about the lxc-devel
mailing list