start: lxc_destroy_container_on_signal()

parent ba7d715b
...@@ -1904,28 +1904,29 @@ static void lxc_destroy_container_on_signal(struct lxc_handler *handler, ...@@ -1904,28 +1904,29 @@ static void lxc_destroy_container_on_signal(struct lxc_handler *handler,
const char *name) const char *name)
{ {
char destroy[MAXPATHLEN]; char destroy[MAXPATHLEN];
bool bret = true;
int ret = 0;
struct lxc_container *c; struct lxc_container *c;
int ret = 0;
bool bret = true;
if (handler->conf->rootfs.path && handler->conf->rootfs.mount) { if (handler->conf->rootfs.path && handler->conf->rootfs.mount) {
bret = do_destroy_container(handler); bret = do_destroy_container(handler);
if (!bret) { if (!bret) {
ERROR("Error destroying rootfs for container \"%s\".", name); ERROR("Error destroying rootfs for container \"%s\"", name);
return; return;
} }
} }
INFO("Destroyed rootfs for container \"%s\".", name); INFO("Destroyed rootfs for container \"%s\"", name);
ret = snprintf(destroy, MAXPATHLEN, "%s/%s", handler->lxcpath, name); ret = snprintf(destroy, MAXPATHLEN, "%s/%s", handler->lxcpath, name);
if (ret < 0 || ret >= MAXPATHLEN) { if (ret < 0 || ret >= MAXPATHLEN) {
ERROR("Error destroying directory for container \"%s\".", name); ERROR("Error destroying directory for container \"%s\"", name);
return; return;
} }
c = lxc_container_new(name, handler->lxcpath); c = lxc_container_new(name, handler->lxcpath);
if (c) { if (c) {
if (container_disk_lock(c)) { if (container_disk_lock(c)) {
INFO("Could not update lxc_snapshots file."); INFO("Could not update lxc_snapshots file");
lxc_container_put(c); lxc_container_put(c);
} else { } else {
mod_all_rdeps(c, false); mod_all_rdeps(c, false);
...@@ -1941,10 +1942,10 @@ static void lxc_destroy_container_on_signal(struct lxc_handler *handler, ...@@ -1941,10 +1942,10 @@ static void lxc_destroy_container_on_signal(struct lxc_handler *handler,
ret = lxc_rmdir_onedev(destroy, NULL); ret = lxc_rmdir_onedev(destroy, NULL);
if (ret < 0) { if (ret < 0) {
ERROR("Error destroying directory for container \"%s\".", name); ERROR("Error destroying directory for container \"%s\"", name);
return; return;
} }
INFO("Destroyed directory for container \"%s\".", name); INFO("Destroyed directory for container \"%s\"", name);
} }
static int lxc_rmdir_onedev_wrapper(void *data) static int lxc_rmdir_onedev_wrapper(void *data)
......
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