chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ecc6e2b
)
execute: check ppid, not pid for 1
author
Lennart Poettering
<lennart@poettering.net>
Wed, 19 May 2010 23:34:42 +0000
(
01:34
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 19 May 2010 23:34:42 +0000
(
01:34
+0200)
src/execute.c
patch
|
blob
|
history
diff --git
a/src/execute.c
b/src/execute.c
index 53f6d9ad06dcaf8169ef825278bae2753ebaae46..06eb15215df5f486c18e82e0e22c6303c9175ea7 100644
(file)
--- 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,
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 (getp
p
id() == 1)
return open_terminal_as(tty_path(context), O_WRONLY, STDOUT_FILENO);
return STDOUT_FILENO;
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 &&
if (e == EXEC_OUTPUT_INHERIT &&
o == EXEC_OUTPUT_INHERIT &&
i != EXEC_INPUT_NULL &&
- getpid () != 1)
+ getp
p
id () != 1)
return STDERR_FILENO;
/* Duplicate form stdout if possible */
return STDERR_FILENO;
/* Duplicate form stdout if possible */