summaryrefslogtreecommitdiff
path: root/src/core
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/core
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/core')
-rw-r--r--src/core/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/main.c b/src/core/main.c
index e6a90e0133..546582cff0 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -374,7 +374,8 @@ static int parse_proc_cmdline_word(const char *word) {
arg_sysv_console = r;
#endif
- } else if (startswith(word, "systemd.")) {
+ } else if (startswith(word, "systemd.") ||
+ (in_initrd() && startswith(word, "rd.systemd."))) {
log_warning("Unknown kernel switch %s. Ignoring.", word);