proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 15:29:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

start: userns_exec_full()

Browse Source 
Closes #1800.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2017-09-09 11:21:51 +02:00
parent ee484f7f68
commit 94b0a3ac39
No known key found for this signature in database
GPG Key ID: 7B3C391EFEA93624
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lxc/start.c
View File

@ -1596,8 +1596,8 @@ static void lxc_destroy_container_on_signal(struct lxc_handler *handler,
} }
if (!handler->am_root) if (!handler->am_root)
ret = userns_exec_1(handler->conf, lxc_rmdir_onedev_wrapper, ret = userns_exec_full(handler->conf, lxc_rmdir_onedev_wrapper,
destroy, "lxc_rmdir_onedev_wrapper"); destroy, "lxc_rmdir_onedev_wrapper");
else else
ret = lxc_rmdir_onedev(destroy, NULL); ret = lxc_rmdir_onedev(destroy, NULL);
@ -1615,9 +1615,12 @@ static int lxc_rmdir_onedev_wrapper(void *data)
} }
static bool do_destroy_container(struct lxc_handler *handler) { static bool do_destroy_container(struct lxc_handler *handler) {
int ret;
if (!handler->am_root) { if (!handler->am_root) {
if (userns_exec_1(handler->conf, storage_destroy_wrapper, ret = userns_exec_full(handler->conf, storage_destroy_wrapper,
handler->conf, "storage_destroy_wrapper") < 0) handler->conf, "storage_destroy_wrapper");
if (ret < 0)
return false; return false;
return true; return true;