summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-06-22 10:11:06 +0200
committerLennart Poettering <lennart@poettering.net>2012-06-22 10:11:06 +0200
commit66a78c2b95ba6cc0be15dab68c5af816fb5b7a33 (patch)
tree603e004a1b4968020034031d6011743aa8f6609a /src/journal
parent601913d616b46692ffe5992dc9a372a0c8b75cd2 (diff)
cryptsetup: allow configuration of LUKS disks via the kernel cmdline
This generalizes a bit of the functionality already available in dracut.
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journald.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/journal/journald.c b/src/journal/journald.c
index 98a155bdef..7ea68aab3c 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -2648,7 +2648,8 @@ static int server_parse_proc_cmdline(Server *s) {
log_warning("Failed to parse forward to console switch %s. Ignoring.", word + 36);
else
s->forward_to_console = r;
- }
+ } else if (startswith(word, "systemd.journald"))
+ log_warning("Invalid systemd.journald parameter. Ignoring.");
free(word);
}