summaryrefslogtreecommitdiff
path: root/src/core/execute.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/execute.c')
-rw-r--r--src/core/execute.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/core/execute.c b/src/core/execute.c
index 14a7d1399b..7eb9506e8c 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -684,6 +684,14 @@ static int setup_output(
/* We don't reset the terminal if this is just about output */
return open_terminal_as(exec_context_tty_path(context), O_WRONLY, fileno);
+ case EXEC_OUTPUT_DLOG_OR_JOURNAL:
+ r = wire_up_dlog(fileno, ident);
+ if (r >= 0)
+ return fileno;
+
+ o = EXEC_OUTPUT_JOURNAL; // used inside `connect_logger_as`, but let's not involve dlog there
+ /* fallthrough */
+
case EXEC_OUTPUT_SYSLOG:
case EXEC_OUTPUT_SYSLOG_AND_CONSOLE:
case EXEC_OUTPUT_KMSG:
@@ -5680,6 +5688,7 @@ static const char* const exec_output_table[_EXEC_OUTPUT_MAX] = {
[EXEC_OUTPUT_DLOG] = "dlog",
[EXEC_OUTPUT_DLOG_OR_NULL] = "dlog|null",
[EXEC_OUTPUT_DLOG_OR_KMSG] = "dlog|kmsg",
+ [EXEC_OUTPUT_DLOG_OR_JOURNAL] = "dlog|journal",
};
DEFINE_STRING_TABLE_LOOKUP(exec_output, ExecOutput);