From: KATOH Yasufumi <karma@jazz.email.ne.jp>
Date: Wed, 1 Apr 2015 16:56:03 +0000 (+0900)
Subject: Add the use of 'attach' to lxc-start-ephemeral(1)
X-Git-Tag: lxc-2.0.0.beta1~329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56e4a18564f8ab3d93c0f2b5f91aa5cff4f171c9;p=thirdparty%2Flxc.git

Add the use of 'attach' to lxc-start-ephemeral(1)

Update for commit 8158c05

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/doc/ja/lxc-start-ephemeral.sgml.in b/doc/ja/lxc-start-ephemeral.sgml.in
index 310278219..3f79c742d 100644
--- a/doc/ja/lxc-start-ephemeral.sgml.in
+++ b/doc/ja/lxc-start-ephemeral.sgml.in
@@ -224,10 +224,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 1b72c01f8..6f3a32516 100644
--- a/doc/lxc-start-ephemeral.sgml.in
+++ b/doc/lxc-start-ephemeral.sgml.in
@@ -183,8 +183,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>