summaryrefslogtreecommitdiff
path: root/src/vconsole
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2017-12-27 21:49:19 +0100
committerLennart Poettering <lennart@poettering.net>2018-01-04 13:27:26 +0100
commitb6e1fff13dbfc1623de41b78bc525f410fb59b91 (patch)
treeb920f51ea393852d2776aecaa0701293df8903a6 /src/vconsole
parent799a960d1f80c58fd982b3c248906cd4791a69fa (diff)
downloadsystemd-b6e1fff13dbfc1623de41b78bc525f410fb59b91.tar.gz
process-util: add another fork_safe() flag for enabling LOG_ERR/LOG_WARN logging
Diffstat (limited to 'src/vconsole')
-rw-r--r--src/vconsole/vconsole-setup.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 60e23959ac..7685f1d714 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -153,9 +153,9 @@ static int keyboard_load_and_wait(const char *vc, const char *map, const char *m
log_debug("Executing \"%s\"...",
strnull((cmd = strv_join((char**) args, " "))));
- r = safe_fork("(loadkeys)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS, &pid);
+ r = safe_fork("(loadkeys)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_LOG, &pid);
if (r < 0)
- return log_error_errno(r, "Failed to fork: %m");
+ return r;
if (r == 0) {
execv(args[0], (char **) args);
_exit(EXIT_FAILURE);
@@ -193,9 +193,9 @@ static int font_load_and_wait(const char *vc, const char *font, const char *map,
log_debug("Executing \"%s\"...",
strnull((cmd = strv_join((char**) args, " "))));
- r = safe_fork("(setfont)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS, &pid);
+ r = safe_fork("(setfont)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_LOG, &pid);
if (r < 0)
- return log_error_errno(r, "Failed to fork: %m");
+ return r;
if (r == 0) {
execv(args[0], (char **) args);
_exit(EXIT_FAILURE);