summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2020-12-09 01:49:13 +0900
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-12-10 17:39:17 +0100
commit325386c4e3c0ff45b72b298cbcbbb4b0aaa03d29 (patch)
tree4b3bb26645e85aefeee501f4df81359e27f65b4c
parent1b00688fae41b8987e62e8082d682098cce296ac (diff)
downloadsystemd-325386c4e3c0ff45b72b298cbcbbb4b0aaa03d29.tar.gz
log: open journal when cli program run in a service unit
Previously, cli programs like networkctl always use console for logging. (cherry picked from commit 13ee93978479b80e980d8551c689a7087bf1817e)
-rw-r--r--src/basic/log.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/basic/log.c b/src/basic/log.c
index 1611bf1006..e2963981fb 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -1448,7 +1448,9 @@ void log_setup_service(void) {
void log_setup_cli(void) {
/* Sets up logging the way it is most appropriate for running a program as a CLI utility. */
- log_show_color(true);
+ log_set_target(LOG_TARGET_AUTO);
log_parse_environment_cli();
(void) log_open();
+ if (log_on_console() && show_color < 0)
+ log_show_color(true);
}