Journal seems to default to /dev/null even when not explicitly
specified, so there is no separate "dlog|journal|null".
Change-Id: I5682de7dce014f76f403406ef73c7bd5a9661d5e
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
/* We don't reset the terminal if this is just about output */
return open_terminal_as(exec_context_tty_path(context), O_WRONLY, fileno);
+#if HAVE_LIBDLOG_REDIRECT
+ 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 */
+#endif
+
case EXEC_OUTPUT_KMSG:
case EXEC_OUTPUT_KMSG_AND_CONSOLE:
case EXEC_OUTPUT_JOURNAL:
[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",
#endif
};
EXEC_OUTPUT_DLOG,
EXEC_OUTPUT_DLOG_OR_NULL,
EXEC_OUTPUT_DLOG_OR_KMSG,
+ EXEC_OUTPUT_DLOG_OR_JOURNAL,
#endif
_EXEC_OUTPUT_MAX,
_EXEC_OUTPUT_INVALID = -EINVAL,