picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nspawn: make use of log_set_open_when_needed() in nspawn too

Browse source 
Let's make use of log_set_open_when_needed() in nspawn too, i.e. at the
point where we close logging because we are about to rearrange fds,
let's automatically reopen the logging fds when we need them, the same
way as we do that in the service manager. This makes things simpler and
more robust.
This commit is contained in:
Lennart Poettering 2018-05-22 16:51:28 +02:00
parent 8904ab86b0
commit 8ca082b49a
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/nspawn/nspawn.c
View file

@ -2597,15 +2597,12 @@ static int inner_child(
return r;
}
/* Now, explicitly close the log, so that we
* then can close all remaining fds. Closing
* the log explicitly first has the benefit
* that the logging subsystem knows about it,
* and is thus ready to be reopened should we
* need it again. Note that the other fds
* closed here are at least the locking and
* barrier fds. */
/* Now, explicitly close the log, so that we then can close all remaining fds. Closing the log explicitly first
* has the benefit that the logging subsystem knows about it, and is thus ready to be reopened should we need
* it again. Note that the other fds closed here are at least the locking and barrier fds. */
log_close();
log_set_open_when_needed(true);
(void) fdset_close_others(fds);
if (arg_start_mode == START_BOOT) {
@ -2643,9 +2640,7 @@ static int inner_child(
exec_target = "/bin/bash, /bin/sh";
}
r = -errno;
(void) log_open();
return log_error_errno(r, "execv(%s) failed: %m", exec_target);
return log_error_errno(errno, "execv(%s) failed: %m", exec_target);
}
static int setup_sd_notify_child(void) {