proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-26 05:55:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
same as the commit 25070b6601

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
KATOH Yasufumi 2013-12-24 23:33:04 +09:00 committed by Serge Hallyn
parent 37c41004f7
commit 2da1f56ce3
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/ja/lxc-autostart.sgml.in
View File

@ -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 Only request a clean shutdown, do not kill the
container tasks if the clean shutdown fails. container tasks if the clean shutdown fails.
--> -->
クリーンなシャットダウンのみを要求します．クリーンなシャットダウンに失敗した場合でも，コンテナのタスクを kill しないでください． クリーンなシャットダウンのみを要求します．クリーンなシャットダウンに失敗した場合でも，コンテナのタスクを kill しません．
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -166,10 +166,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
<listitem> <listitem>
<para> <para>
<!-- <!--
Wait TIMEOUT seconds before hard-stopping the Wait TIMEOUT seconds before hard-stopping the container.
container of (in the reboot case) returning failure.
--> -->
コンテナの強制停止まで TIMEOUT 秒待ちます．リブートの場合，失敗が返るのを TIMEOUT 秒待ちます． コンテナの強制停止まで TIMEOUT 秒待ちます．
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

3
doc/lxc-autostart.sgml.in
View File

@ -139,8 +139,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</term> </term>
<listitem> <listitem>
<para> <para>
Wait TIMEOUT seconds before hard-stopping the Wait TIMEOUT seconds before hard-stopping the container.
container of (in the reboot case) returning failure.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

1
src/lxc/lxc_autostart.c
View File

@ -273,6 +273,7 @@ int main(int argc, char *argv[])
if (my_args.list) if (my_args.list)
printf("%s\n", c->name); printf("%s\n", c->name);
else { else {
my_args.timeout = 0;
if (!c->shutdown(c, my_args.timeout)) if (!c->shutdown(c, my_args.timeout))
fprintf(stderr, "Error shutting down container: %s\n", c->name); fprintf(stderr, "Error shutting down container: %s\n", c->name);
} }