From 487d80082ff1800198a5b7359ebc5f416a6f6bde Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Fri, 24 Jan 2014 11:41:27 +0800 Subject: [PATCH] lxccontainer: remove PID file after lxc_start return Make the way symmetric. This also fix the file leak in daemon model. Signed-off-by: Qiang Huang Acked-by: Serge E. Hallyn --- src/lxc/lxccontainer.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index 6ea7c113e3..d0c5e07ac8 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -233,11 +233,6 @@ static void lxc_container_free(struct lxc_container *c) free(c->config_path); c->config_path = NULL; } - if (c->pidfile) { - unlink(c->pidfile); - free(c->pidfile); - c->pidfile = NULL; - } free(c); } @@ -665,6 +660,12 @@ static bool lxcapi_start(struct lxc_container *c, int useinit, char * const argv goto reboot; } + if (c->pidfile) { + unlink(c->pidfile); + free(c->pidfile); + c->pidfile = NULL; + } + if (daemonize) exit (ret == 0 ? true : false); else