Commit 49badbbe by S.Çağlar Onur Committed by Serge Hallyn

return the result of the lxcapi_want_close_all_fds call to the caller

parent 130a1888
...@@ -456,16 +456,17 @@ static void lxcapi_want_daemonize(struct lxc_container *c) ...@@ -456,16 +456,17 @@ static void lxcapi_want_daemonize(struct lxc_container *c)
container_mem_unlock(c); container_mem_unlock(c);
} }
static void lxcapi_want_close_all_fds(struct lxc_container *c) static bool lxcapi_want_close_all_fds(struct lxc_container *c)
{ {
if (!c || !c->lxc_conf) if (!c || !c->lxc_conf)
return; return false;
if (container_mem_lock(c)) { if (container_mem_lock(c)) {
ERROR("Error getting mem lock"); ERROR("Error getting mem lock");
return; return false;
} }
c->lxc_conf->close_all_fds = 1; c->lxc_conf->close_all_fds = 1;
container_mem_unlock(c); container_mem_unlock(c);
return true;
} }
static bool lxcapi_wait(struct lxc_container *c, const char *state, int timeout) static bool lxcapi_wait(struct lxc_container *c, const char *state, int timeout)
......
...@@ -68,7 +68,7 @@ struct lxc_container { ...@@ -68,7 +68,7 @@ struct lxc_container {
bool (*startl)(struct lxc_container *c, int useinit, ...); bool (*startl)(struct lxc_container *c, int useinit, ...);
bool (*stop)(struct lxc_container *c); bool (*stop)(struct lxc_container *c);
void (*want_daemonize)(struct lxc_container *c); void (*want_daemonize)(struct lxc_container *c);
void (*want_close_all_fds)(struct lxc_container *c); bool (*want_close_all_fds)(struct lxc_container *c);
// Return current config file name. The result is strdup()d, so free the result. // Return current config file name. The result is strdup()d, so free the result.
char *(*config_file_name)(struct lxc_container *c); char *(*config_file_name)(struct lxc_container *c);
// for wait, timeout == -1 means wait forever, timeout == 0 means don't wait. // for wait, timeout == -1 means wait forever, timeout == 0 means don't wait.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment