lxc-autostart: don't set timeout if user requested -s

same as the commit 25070b660187b61aa4e969db01b55d1360639543

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

diff --git a/doc/ja/lxc-autostart.sgml.in b/doc/ja/lxc-autostart.sgml.in
index f43867a7dacc8fe58b86dcb032cd128d52ace4bf..ffff6958ed8fa3c604776ef1c062f5ebd383cc37 100644 (file)
--- a/doc/ja/lxc-autostart.sgml.in
+++ b/doc/ja/lxc-autostart.sgml.in
@@ -124,7 +124,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
                         Only request a clean shutdown, do not kill the
                         container tasks if the clean shutdown fails.
                         -->
-                      ã\82¯ã\83ªã\83¼ã\83³ã\81ªã\82·ã\83£ã\83\83ã\83\88ã\83\80ã\82¦ã\83³ã\81®ã\81¿ã\82\92è¦\81æ±\82ã\81\97ã\81¾ã\81\99ï¼\8eã\82¯ã\83ªã\83¼ã\83³ã\81ªã\82·ã\83£ã\83\83ã\83\88ã\83\80ã\82¦ã\83³ã\81«å¤±æ\95\97ã\81\97ã\81\9få ´å\90\88ã\81§ã\82\82ï¼\8cã\82³ã\83³ã\83\86ã\83\8aã\81®ã\82¿ã\82¹ã\82¯ã\82\92 kill ã\81\97ã\81ªã\81\84ã\81§ã\81\8fã\81 ã\81\95ã\81\84．
+                      ã\82¯ã\83ªã\83¼ã\83³ã\81ªã\82·ã\83£ã\83\83ã\83\88ã\83\80ã\82¦ã\83³ã\81®ã\81¿ã\82\92è¦\81æ±\82ã\81\97ã\81¾ã\81\99ï¼\8eã\82¯ã\83ªã\83¼ã\83³ã\81ªã\82·ã\83£ã\83\83ã\83\88ã\83\80ã\82¦ã\83³ã\81«å¤±æ\95\97ã\81\97ã\81\9få ´å\90\88ã\81§ã\82\82ï¼\8cã\82³ã\83³ã\83\86ã\83\8aã\81®ã\82¿ã\82¹ã\82¯ã\82\92 kill ã\81\97ã\81¾ã\81\9bã\82\93．
                     </para>
                 </listitem>
             </varlistentry>
@@ -166,10 +166,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
                 <listitem>
                     <para>
                       <!--
-                        Wait TIMEOUT seconds before hard-stopping the
-                        container of (in the reboot case) returning failure.
+                        Wait TIMEOUT seconds before hard-stopping the container.
                         -->
-                      コンテナの強制停止まで TIMEOUT 秒待ちます．リブートの場合，失敗が返るのを TIMEOUT 秒待ちます．
+                      コンテナの強制停止まで TIMEOUT 秒待ちます．
                     </para>
                 </listitem>
             </varlistentry>

diff --git a/doc/lxc-autostart.sgml.in b/doc/lxc-autostart.sgml.in
index 038abb709e017826d8bb6214afc5e26781757dd0..2f132ade90f4ab45250a25999969ac4dde0991ac 100644 (file)
--- a/doc/lxc-autostart.sgml.in
+++ b/doc/lxc-autostart.sgml.in
@@ -139,8 +139,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
                 </term>
                 <listitem>
                     <para>
-                        Wait TIMEOUT seconds before hard-stopping the
-                        container of (in the reboot case) returning failure.
+                        Wait TIMEOUT seconds before hard-stopping the container.
                     </para>
                 </listitem>
             </varlistentry>

diff --git a/src/lxc/lxc_autostart.c b/src/lxc/lxc_autostart.c
index 588a9c61168e895af824af55e05512009b34814f..1407a417421285d784411d4dec0040ba8e52fea6 100644 (file)
--- a/src/lxc/lxc_autostart.c
+++ b/src/lxc/lxc_autostart.c
@@ -273,6 +273,7 @@ int main(int argc, char *argv[])
                                if (my_args.list)
                                        printf("%s\n", c->name);
                                else {
+                                       my_args.timeout = 0;
                                        if (!c->shutdown(c, my_args.timeout))
                                                fprintf(stderr, "Error shutting down container: %s\n", c->name);
                                }