execute: s/EXEC_OUTPUT_KERNEL/EXEC_OUTPUT_KMSG/ to follow LOG_TARGET_xxx nomenclature

diff --git a/src/execute.c b/src/execute.c
index 37b2f8412c87af5ec18c2553941e874325ce87b5..d899a543f4e174561cea1145146333a748e9c78a 100644 (file)
--- a/src/execute.c
+++ b/src/execute.c
@@ -189,7 +189,7 @@ static int connect_logger_as(const ExecContext *context, ExecOutput output, cons
                 "%i\n"
                 "%s\n"
                 "%i\n",
-                output == EXEC_OUTPUT_KERNEL ? "kmsg" : "syslog",
+                output == EXEC_OUTPUT_KMSG ? "kmsg" : "syslog",
                 context->syslog_priority,
                 context->syslog_identifier ? context->syslog_identifier : ident,
                 !context->syslog_no_prefix);
@@ -328,7 +328,7 @@ static int setup_output(const ExecContext *context, int socket_fd, const char *i
                 return open_terminal_as(tty_path(context), O_WRONLY, STDOUT_FILENO);
 
         case EXEC_OUTPUT_SYSLOG:
-        case EXEC_OUTPUT_KERNEL:
+        case EXEC_OUTPUT_KMSG:
                 return connect_logger_as(context, o, ident, STDOUT_FILENO);
 
         case EXEC_OUTPUT_SOCKET:
@@ -377,7 +377,7 @@ static int setup_error(const ExecContext *context, int socket_fd, const char *id
                 return open_terminal_as(tty_path(context), O_WRONLY, STDERR_FILENO);
 
         case EXEC_OUTPUT_SYSLOG:
-        case EXEC_OUTPUT_KERNEL:
+        case EXEC_OUTPUT_KMSG:
                 return connect_logger_as(context, e, ident, STDERR_FILENO);
 
         case EXEC_OUTPUT_SOCKET:
@@ -1266,8 +1266,8 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
                         "%sTTYPath: %s\n",
                         prefix, c->tty_path);
 
-        if (c->std_output == EXEC_OUTPUT_SYSLOG || c->std_output == EXEC_OUTPUT_KERNEL ||
-            c->std_error == EXEC_OUTPUT_SYSLOG || c->std_error == EXEC_OUTPUT_KERNEL)
+        if (c->std_output == EXEC_OUTPUT_SYSLOG || c->std_output == EXEC_OUTPUT_KMSG ||
+            c->std_error == EXEC_OUTPUT_SYSLOG || c->std_error == EXEC_OUTPUT_KMSG)
                 fprintf(f,
                         "%sSyslogFacility: %s\n"
                         "%sSyslogLevel: %s\n",
@@ -1616,7 +1616,7 @@ static const char* const exec_output_table[_EXEC_OUTPUT_MAX] = {
         [EXEC_OUTPUT_NULL] = "null",
         [EXEC_OUTPUT_TTY] = "tty",
         [EXEC_OUTPUT_SYSLOG] = "syslog",
-        [EXEC_OUTPUT_KERNEL] = "kernel",
+        [EXEC_OUTPUT_KMSG] = "kmsg",
         [EXEC_OUTPUT_SOCKET] = "socket"
 };
 

diff --git a/src/execute.h b/src/execute.h
index be73542d4b02345d46244630d79f13d5272b110c..d42e0ba9d97cb3eca8da2c619ddaa695b39f6e10 100644 (file)
--- a/src/execute.h
+++ b/src/execute.h
@@ -56,7 +56,7 @@ typedef enum ExecOutput {
         EXEC_OUTPUT_NULL,
         EXEC_OUTPUT_TTY,
         EXEC_OUTPUT_SYSLOG,
-        EXEC_OUTPUT_KERNEL,
+        EXEC_OUTPUT_KMSG,
         EXEC_OUTPUT_SOCKET,
         _EXEC_OUTPUT_MAX,
         _EXEC_OUTPUT_INVALID = -1

diff --git a/src/unit.c b/src/unit.c
index 374d2e133106def502cca34b9e24f364af1d9cdd..8f0b0773f1b9f0c0730bcb1448ce711c574a0c9e 100644 (file)
--- a/src/unit.c
+++ b/src/unit.c
@@ -534,7 +534,7 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
         assert(u);
         assert(c);
 
-        if (c->std_output != EXEC_OUTPUT_KERNEL && c->std_output != EXEC_OUTPUT_SYSLOG)
+        if (c->std_output != EXEC_OUTPUT_KMSG && c->std_output != EXEC_OUTPUT_SYSLOG)
                 return 0;
 
         /* If syslog or kernel logging is requested, make sure our own