lxc-attach: switch to attach_run_wait

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

lxc-attach: switch to attach_run_wait
8cddb10f · Christian Brauner · b557844a · 8cddb10f
Unverified Commit 8cddb10f authored Feb 21, 2019 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 10 deletions

lxc_attach.c src/lxc/tools/lxc_attach.c +14 -10

No files found.
--- a/src/lxc/tools/lxc_attach.c
+++ b/src/lxc/tools/lxc_attach.c
@@ -372,19 +372,23 @@ int main(int argc, char *argv[])
 	if (my_args.gid)
 		attach_options.gid = my_args.gid;
-	if (command.program)
+	if (command.program) {
-		ret = c->attach(c, lxc_attach_run_command, &command, &attach_options, &pid);
+		ret = c->attach_run_wait(c, &attach_options, command.program,
-	else
+					 (const char **)command.argv);
+		if (ret < 0)
+			goto out;
+	} else {
 		ret = c->attach(c, lxc_attach_run_shell, NULL, &attach_options, &pid);
-	if (ret < 0)
+		if (ret < 0)
-		goto out;
+			goto out;
-	ret = lxc_wait_for_pid_status(pid);
+		ret = lxc_wait_for_pid_status(pid);
-	if (ret < 0)
+		if (ret < 0)
-		goto out;
+			goto out;
-	if (WIFEXITED(ret))
+		if (WIFEXITED(ret))
-		wexit = WEXITSTATUS(ret);
+			wexit = WEXITSTATUS(ret);
+	}
 out:
 	lxc_container_put(c);