summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-01-07 00:59:00 +0100
committerLennart Poettering <lennart@poettering.net>2012-01-07 01:26:08 +0100
commiteffb1102d3f1d6bc2d0bda5328d3ce2139af9850 (patch)
tree5b6f92b37b83e6f8535c6185780f69fba1206769 /src
parenta6723bc9a7af10b39b01d236bf7089816559c68d (diff)
journald: introduce systemd_journald.forward_to_kmsg=1 (and friends) to enable kmsg forwarding globally via kernel cmdline
Diffstat (limited to 'src')
-rw-r--r--src/journal/journald.c55
1 files changed, 55 insertions, 0 deletions
diff --git a/src/journal/journald.c b/src/journal/journald.c
index 53eef8b4a3..1ec1542a14 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -47,6 +47,7 @@
#include "journal-internal.h"
#include "conf-parser.h"
#include "journald.h"
+#include "virt.h"
#define USER_JOURNALS_MAX 1024
#define STDOUT_STREAMS_MAX 4096
@@ -2057,6 +2058,59 @@ static int open_signalfd(Server *s) {
return 0;
}
+static int server_parse_proc_cmdline(Server *s) {
+ char *line, *w, *state;
+ int r;
+ size_t l;
+
+ if (detect_container(NULL) > 0)
+ return 0;
+
+ r = read_one_line_file("/proc/cmdline", &line);
+ if (r < 0) {
+ log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ return 0;
+ }
+
+ FOREACH_WORD_QUOTED(w, l, line, state) {
+ char *word;
+
+ word = strndup(w, l);
+ if (!word) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (startswith(word, "systemd_journald.forward_to_syslog=")) {
+ r = parse_boolean(word + 35);
+ if (r < 0)
+ log_warning("Failed to parse forward to syslog switch %s. Ignoring.", word + 35);
+ else
+ s->forward_to_syslog = r;
+ } else if (startswith(word, "systemd_journald.forward_to_kmsg=")) {
+ r = parse_boolean(word + 33);
+ if (r < 0)
+ log_warning("Failed to parse forward to kmsg switch %s. Ignoring.", word + 33);
+ else
+ s->forward_to_kmsg = r;
+ } else if (startswith(word, "systemd_journald.forward_to_console=")) {
+ r = parse_boolean(word + 36);
+ if (r < 0)
+ log_warning("Failed to parse forward to console switch %s. Ignoring.", word + 36);
+ else
+ s->forward_to_console = r;
+ }
+
+ free(word);
+ }
+
+ r = 0;
+
+finish:
+ free(line);
+ return r;
+}
+
static int server_parse_config_file(Server *s) {
FILE *f;
const char *fn;
@@ -2101,6 +2155,7 @@ static int server_init(Server *s) {
memset(&s->runtime_metrics, 0xFF, sizeof(s->runtime_metrics));
server_parse_config_file(s);
+ server_parse_proc_cmdline(s);
s->user_journals = hashmap_new(trivial_hash_func, trivial_compare_func);
if (!s->user_journals) {