start: userns_exec_full()

Closes #1800. Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

start: userns_exec_full()
454d6a18 · Christian Brauner · Stéphane Graber · 4f0ba8f6 · 454d6a18
Unverified Commit 454d6a18 authored Sep 09, 2017 by Christian Brauner Committed by Stéphane Graber Sep 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

start.c src/lxc/start.c +7 -4

No files found.
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1596,8 +1596,8 @@ static void lxc_destroy_container_on_signal(struct lxc_handler *handler,
 	}

 	if (!handler->am_root)
-		ret = userns_exec_1(handler->conf, lxc_rmdir_onedev_wrapper,
-				    destroy, "lxc_rmdir_onedev_wrapper");
+		ret = userns_exec_full(handler->conf, lxc_rmdir_onedev_wrapper,
+				       destroy, "lxc_rmdir_onedev_wrapper");
 	else
 		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) {
+	int ret;
+
 	if (!handler->am_root) {
-		if (userns_exec_1(handler->conf, storage_destroy_wrapper,
-				  handler->conf, "storage_destroy_wrapper") < 0)
+		ret = userns_exec_full(handler->conf, storage_destroy_wrapper,
+				       handler->conf, "storage_destroy_wrapper");
+		if (ret < 0)
 			return false;

 		return true;