From 7ddc2dc5e67bf0d4ace73161d6a3cde0ea85c62b Mon Sep 17 00:00:00 2001 From: Shawn Landden Date: Thu, 4 Jan 2018 03:37:15 -0800 Subject: [PATCH] fix machinectl shell (in machined) (#7785) 4c253ed broke machined $machinectl shell arch Failed to get shell PTY: Input/output error Closes: #7779 v2: do not drop DEATHSIG flag --- src/basic/process-util.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/basic/process-util.c b/src/basic/process-util.c index 0537368..7da22f4 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -1237,10 +1237,14 @@ int safe_fork_full( } if (flags & FORK_DEATHSIG) { + pid_t ppid; /* Let's see if the parent PID is still the one we started from? If not, then the parent * already died by the time we set PR_SET_PDEATHSIG, hence let's emulate the effect */ - if (getppid() != original_pid) { + ppid = getppid(); + if (ppid == 0) + /* Parent is in a differn't PID namespace. */; + else if (ppid != original_pid) { log_debug("Parent died early, raising SIGTERM."); (void) raise(SIGTERM); _exit(EXIT_FAILURE); -- 2.7.4