From ae3beac9af120dc15d480496fa0dca0cc9ca5ad0 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 19 Feb 2018 00:49:29 +0100 Subject: [PATCH] start: lxc_destroy_container_on_signal() Signed-off-by: Christian Brauner --- src/lxc/start.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lxc/start.c b/src/lxc/start.c index fa60778ff..3df76ddf6 100644 --- a/src/lxc/start.c +++ b/src/lxc/start.c @@ -1980,28 +1980,29 @@ static void lxc_destroy_container_on_signal(struct lxc_handler *handler, const char *name) { char destroy[MAXPATHLEN]; - bool bret = true; - int ret = 0; struct lxc_container *c; + int ret = 0; + bool bret = true; + if (handler->conf->rootfs.path && handler->conf->rootfs.mount) { bret = do_destroy_container(handler); if (!bret) { - ERROR("Error destroying rootfs for container \"%s\".", name); + ERROR("Error destroying rootfs for container \"%s\"", name); return; } } - INFO("Destroyed rootfs for container \"%s\".", name); + INFO("Destroyed rootfs for container \"%s\"", name); ret = snprintf(destroy, MAXPATHLEN, "%s/%s", handler->lxcpath, name); if (ret < 0 || ret >= MAXPATHLEN) { - ERROR("Error destroying directory for container \"%s\".", name); + ERROR("Error destroying directory for container \"%s\"", name); return; } c = lxc_container_new(name, handler->lxcpath); if (c) { if (container_disk_lock(c)) { - INFO("Could not update lxc_snapshots file."); + INFO("Could not update lxc_snapshots file"); lxc_container_put(c); } else { mod_all_rdeps(c, false); @@ -2017,10 +2018,10 @@ static void lxc_destroy_container_on_signal(struct lxc_handler *handler, ret = lxc_rmdir_onedev(destroy, NULL); if (ret < 0) { - ERROR("Error destroying directory for container \"%s\".", name); + ERROR("Error destroying directory for container \"%s\"", name); return; } - INFO("Destroyed directory for container \"%s\".", name); + INFO("Destroyed directory for container \"%s\"", name); } static int lxc_rmdir_onedev_wrapper(void *data)