proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-09 21:09:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Destroy bdevs using bdev_destroy() from bdev.h

Browse Source 
Signed-off-by: Christian Brauner <christianvanbrauner@gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Christian Brauner 2015-09-08 22:37:15 +02:00 committed by Stéphane Graber
parent 339c6f1fb4
commit 297c2d5893
1 changed files with 19 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/lxc/lxccontainer.c
View File

@ -2217,48 +2217,25 @@ static bool has_snapshots(struct lxc_container *c)
return count > 0; return count > 0;
} }
static bool do_destroy_container(struct lxc_conf *conf) {
if (am_unpriv()) {
if (userns_exec_1(conf, bdev_destroy_wrapper, conf) < 0)
return false;
return true;
}
return bdev_destroy(conf);
}
static int lxc_rmdir_onedev_wrapper(void *data) static int lxc_rmdir_onedev_wrapper(void *data)
{ {
char *arg = (char *) data; char *arg = (char *) data;
return lxc_rmdir_onedev(arg, "snaps"); return lxc_rmdir_onedev(arg, "snaps");
} }
static int do_bdev_destroy(struct lxc_conf *conf)
{
struct bdev *r;
int ret = 0;
r = bdev_init(conf, conf->rootfs.path, conf->rootfs.mount, NULL);
if (!r)
return -1;
if (r->ops->destroy(r) < 0)
ret = -1;
bdev_put(r);
return ret;
}
static int bdev_destroy_wrapper(void *data)
{
struct lxc_conf *conf = data;
if (setgid(0) < 0) {
ERROR("Failed to setgid to 0");
return -1;
}
if (setgroups(0, NULL) < 0)
WARN("Failed to clear groups");
if (setuid(0) < 0) {
ERROR("Failed to setuid to 0");
return -1;
}
return do_bdev_destroy(conf);
}
static bool container_destroy(struct lxc_container *c) static bool container_destroy(struct lxc_container *c)
{ {
bool bret = false; bool bret = false;
int ret; int ret = 0;
struct lxc_conf *conf; struct lxc_conf *conf;
if (!c || !do_lxcapi_is_defined(c)) if (!c || !do_lxcapi_is_defined(c))
@ -2310,16 +2287,13 @@ static bool container_destroy(struct lxc_container *c)
} }
} }
if (conf && conf->rootfs.path && conf->rootfs.mount) { if (conf && conf->rootfs.path && conf->rootfs.mount) {
if (am_unpriv()) if (!do_destroy_container(conf)) {
ret = userns_exec_1(conf, bdev_destroy_wrapper, conf); ERROR("Error destroying rootfs for %s", c->name);
else goto out;
ret = do_bdev_destroy(conf); }
if (ret < 0) { INFO("Destroyed rootfs for %s", c->name);
ERROR("Error destroying rootfs for %s", c->name); }
goto out;
}
}
mod_all_rdeps(c, false); mod_all_rdeps(c, false);
@ -2334,6 +2308,8 @@ static bool container_destroy(struct lxc_container *c)
ERROR("Error destroying container directory for %s", c->name); ERROR("Error destroying container directory for %s", c->name);
goto out; goto out;
} }
INFO("Destroyed directory for %s", c->name);
bret = true; bret = true;
out: out: