shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 03:25:27 +03:00
Code

nspawn: shown exec() command is misleading

Browse Source 
There's no point in updating exec_target for each binary we try to
execute, if we override it right-away anyway... Let's just do this once,
and include all binaries we try each time.

Follow-up for 1a68e1e543.
This commit is contained in:
Lennart Poettering 2017-02-02 18:27:25 +01:00
parent 486b3d08db
commit ced58da749
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nspawn/nspawn.c
View File

@ -2317,14 +2317,16 @@ static int inner_child(
memcpy_safe(a + 1, arg_parameters, m * sizeof(char*));
a[1 + m] = NULL;
exec_target = a[0] = (char*) "/usr/lib/systemd/systemd";
a[0] = (char*) "/usr/lib/systemd/systemd";
execve(a[0], a, env_use);
exec_target = a[0] = (char*) "/lib/systemd/systemd";
a[0] = (char*) "/lib/systemd/systemd";
execve(a[0], a, env_use);
exec_target = a[0] = (char*) "/sbin/init";
a[0] = (char*) "/sbin/init";
execve(a[0], a, env_use);
exec_target = "/usr/lib/systemd/systemd, /lib/systemd/systemd, /sbin/init";
} else if (!strv_isempty(arg_parameters)) {
exec_target = arg_parameters[0];
execvpe(arg_parameters[0], arg_parameters, env_use);
@ -2333,11 +2335,10 @@ static int inner_child(
/* If we cannot change the directory, we'll end up in /, that is expected. */
(void) chdir(home ?: "/root");
exec_target = "/bin/bash";
execle("/bin/bash", "-bash", NULL, env_use);
exec_target = "/bin/sh";
execle("/bin/sh", "-sh", NULL, env_use);
exec_target = "/bin/bash, /bin/sh";
}
r = -errno;