case EXEC_OUTPUT_INHERIT:
/* If the input is connected to a terminal, inherit that... */
- if (is_terminal_input(i) || i == EXEC_INPUT_SOCKET)
+ if (i != EXEC_INPUT_NULL)
return dup2(STDIN_FILENO, STDOUT_FILENO) < 0 ? -errno : STDOUT_FILENO;
- return STDIN_FILENO;
+ /* For PID 1 stdout is always connected to /dev/null,
+ * 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;
case EXEC_OUTPUT_NULL:
return open_null_as(O_WRONLY, STDOUT_FILENO);
* the way and are not on a tty */
if (e == EXEC_OUTPUT_INHERIT &&
o == EXEC_OUTPUT_INHERIT &&
- !is_terminal_input(i))
+ i != EXEC_INPUT_NULL &&
+ getppid () != 1)
return STDERR_FILENO;
/* Duplicate form stdout if possible */
/* child */
- reset_all_signal_handlers();
+ /* We reset exactly these two signals, since they are
+ * the only ones we set to SIG_IGN in the main
+ * daemon. All others */
+ default_signals(SIGNALS_CRASH_HANLDER,
+ SIGNALS_IGNORE, -1);
if (sigemptyset(&ss) < 0 ||
sigprocmask(SIG_SETMASK, &ss, NULL) < 0) {
c->cpu_sched_policy = SCHED_OTHER;
c->syslog_priority = LOG_DAEMON|LOG_INFO;
c->mount_flags = MS_SHARED;
-
- c->std_input = EXEC_INPUT_NULL;
- c->std_output = EXEC_OUTPUT_SYSLOG;
- c->std_error = EXEC_OUTPUT_SYSLOG;
}
void exec_context_done(ExecContext *c) {