Re: [lxc-devel] [PATCH] Make ephemeral containers survive reboots

2015-09-21 Thread Stéphane Graber 
On Mon, Sep 21, 2015 at 06:01:41PM +0200, Christian Brauner wrote:
> Signed-off-by: Christian Brauner 

Acked-by: Stéphane Graber 

> ---
>  src/lxc/start.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/lxc/start.c b/src/lxc/start.c
> index 3dd1064..4e977c5 100644
> --- a/src/lxc/start.c
> +++ b/src/lxc/start.c
> @@ -502,7 +502,7 @@ void lxc_fini(const char *name, struct lxc_handler 
> *handler)
>   close(handler->ttysock[0]);
>   close(handler->ttysock[1]);
>   }
> - if (handler->conf->ephemeral == 1) {
> + if (handler->conf->ephemeral == 1 && handler->conf->reboot != 1) {
>   lxc_destroy_container_on_signal(handler, name);
>   }
>   cgroup_destroy(handler);
> -- 
> 2.5.3
> 
> ___
> lxc-devel mailing list
> lxc-devel@lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com


signature.asc
Description: Digital signature
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

[lxc-devel] [PATCH] Make ephemeral containers survive reboots

2015-09-21 Thread Christian Brauner 
With this patch, ephemeral containers will survive reboots

Christian Brauner (1):
  Make ephemeral containers survive reboots

 src/lxc/start.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.5.3

___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

[lxc-devel] [PATCH] Make ephemeral containers survive reboots

2015-09-21 Thread Christian Brauner 
Signed-off-by: Christian Brauner 
---
 src/lxc/start.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 3dd1064..4e977c5 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -502,7 +502,7 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
close(handler->ttysock[0]);
close(handler->ttysock[1]);
}
-   if (handler->conf->ephemeral == 1) {
+   if (handler->conf->ephemeral == 1 && handler->conf->reboot != 1) {
lxc_destroy_container_on_signal(handler, name);
}
cgroup_destroy(handler);
-- 
2.5.3

___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel