diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-06-22 10:11:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-06-22 10:11:06 +0200 |
| commit | 66a78c2b95ba6cc0be15dab68c5af816fb5b7a33 (patch) | |
| tree | 603e004a1b4968020034031d6011743aa8f6609a /src/fsck | |
| parent | 601913d616b46692ffe5992dc9a372a0c8b75cd2 (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/fsck')
| -rw-r--r-- | src/fsck/fsck.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index f25ec49442..833f3f74a6 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -112,7 +112,8 @@ static int parse_proc_cmdline(void) { if (detect_container(NULL) > 0) return 0; - if ((r = read_one_line_file("/proc/cmdline", &line)) < 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; } @@ -125,8 +126,8 @@ static int parse_proc_cmdline(void) { arg_force = true; else if (strneq(w, "fsck.mode=skip", l)) arg_skip = true; - else if (startswith(w, "fsck.mode")) - log_warning("Invalid fsck.mode= parameter. Ignoring."); + else if (startswith(w, "fsck")) + log_warning("Invalid fsck parameter. Ignoring."); #if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) else if (strneq(w, "fastboot", l)) arg_skip = true; |