summaryrefslogtreecommitdiff
path: root/src/execute.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-05-20 01:34:42 +0200
committerLennart Poettering <lennart@poettering.net>2010-05-20 01:34:42 +0200
commitdec5d55298280120ad561e2e1f123d57c2c4af1c (patch)
treea0e4b45876382ae55f8f1be3c7a3e6633b0bf537 /src/execute.c
parentecc6e2b84976d0930c4340e202d1de5542092d7c (diff)
execute: check ppid, not pid for 1
Diffstat (limited to 'src/execute.c')
-rw-r--r--src/execute.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/execute.c b/src/execute.c
index 53f6d9ad06..06eb15215d 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -305,8 +305,8 @@ static int setup_output(const ExecContext *context, int socket_fd, const char *i
return dup2(STDIN_FILENO, STDOUT_FILENO) < 0 ? -errno : STDOUT_FILENO;
/* For PID 1 stdout is always connected to /dev/null,
- * hence reopen the console if necessary. */
- if (getpid() == 1)
+ * hence reopen the console if out parent is PID1. */
+ if (getppid() == 1)
return open_terminal_as(tty_path(context), O_WRONLY, STDOUT_FILENO);
return STDOUT_FILENO;
@@ -352,7 +352,7 @@ static int setup_error(const ExecContext *context, int socket_fd, const char *id
if (e == EXEC_OUTPUT_INHERIT &&
o == EXEC_OUTPUT_INHERIT &&
i != EXEC_INPUT_NULL &&
- getpid () != 1)
+ getppid () != 1)
return STDERR_FILENO;
/* Duplicate form stdout if possible */