Quoting KATOH Yasufumi (ka...@jazz.email.ne.jp):
> same as the commit 25070b660187b61aa4e969db01b55d1360639543
>
> Signed-off-by: KATOH Yasufumi <ka...@jazz.email.ne.jp>
Thanks, looks good. (Note you could have simply done c->shutdown(c, 0)
but this works to :)
Acked-by: Serge E. Hallyn <serge.hal...@ubuntu.com>
> ---
> doc/ja/lxc-autostart.sgml.in | 7 +++----
> doc/lxc-autostart.sgml.in | 3 +--
> src/lxc/lxc_autostart.c | 1 +
> 3 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/doc/ja/lxc-autostart.sgml.in b/doc/ja/lxc-autostart.sgml.in
> index f43867a..ffff695 100644
> --- 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.
> -->
> - クリーンなシャットダウンのみを要求します．クリーンなシャットダウンに失敗した場合でも，コンテナのタスクを
> kill しないでください．
> + クリーンなシャットダウンのみを要求します．クリーンなシャットダウンに失敗した場合でも，コンテナのタスクを
> kill しません．
> </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 038abb7..2f132ad 100644
> --- 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 588a9c6..1407a41 100644
> --- 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);
> }
> --
> 1.8.3.4 (Apple Git-47)
>
> _______________________________________________
> lxc-devel mailing list
> lxc-devel@lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
