From 66a78c2b95ba6cc0be15dab68c5af816fb5b7a33 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 22 Jun 2012 10:11:06 +0200 Subject: [PATCH] cryptsetup: allow configuration of LUKS disks via the kernel cmdline This generalizes a bit of the functionality already available in dracut. --- man/kernel-command-line.xml | 33 +++++- src/core/main.c | 3 +- src/cryptsetup/cryptsetup-generator.c | 151 +++++++++++++++++++++++++- src/fsck/fsck.c | 7 +- src/journal/journald.c | 3 +- src/quotacheck/quotacheck.c | 4 +- 6 files changed, 189 insertions(+), 12 deletions(-) diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index 7247be00fc..e49f67fdb3 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -203,10 +203,10 @@ udev.log-priority= - udev.children-max= - udev.udev.exec-delay= rd.udev.log-priority= + udev.children-max= rd.udev.children-max= + udev.udev.exec-delay= rd.udev.udev.exec-delay= @@ -216,8 +216,35 @@ systemd-udevd8. - + + plymouth.enable= + + + May be used to disable + the Plymouth boot splash. For + details see + plymouth8. + + + + + luks= + rd.luks= + luks.crypttab= + rd.luks.crypttab= + luks.uuid= + rd.luks.uuid= + + + Configures the LUKS + full-disk encryption logic at + boot. For details see + cryptsetup@.service8. + + + + 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); diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 3961d5d965..05808df380 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -27,8 +27,13 @@ #include "util.h" #include "unit-name.h" #include "mkdir.h" +#include "virt.h" +#include "strv.h" -const char *arg_dest = "/tmp"; +static const char *arg_dest = "/tmp"; +static bool arg_enabled = true; +static bool arg_read_crypttab = true; +static char **arg_proc_cmdline_disks = NULL; static bool has_option(const char *haystack, const char *needle) { const char *f = haystack; @@ -235,10 +240,111 @@ fail: return r; } +static int parse_proc_cmdline(void) { + 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, "luks=")) { + r = parse_boolean(word + 5); + if (r < 0) + log_warning("Failed to parse luks switch %s. Ignoring.", word + 5); + else + arg_enabled = r; + + } else if (startswith(word, "rd.luks=")) { + + if (in_initrd()) { + r = parse_boolean(word + 8); + if (r < 0) + log_warning("Failed to parse luks switch %s. Ignoring.", word + 8); + else + arg_enabled = r; + } + + } else if (startswith(word, "luks.crypttab=")) { + r = parse_boolean(word + 14); + if (r < 0) + log_warning("Failed to parse luks crypttab switch %s. Ignoring.", word + 14); + else + arg_read_crypttab = r; + + } else if (startswith(word, "rd.luks.crypttab=")) { + + if (in_initrd()) { + r = parse_boolean(word + 17); + if (r < 0) + log_warning("Failed to parse luks crypttab switch %s. Ignoring.", word + 17); + else + arg_read_crypttab = r; + } + + } else if (startswith(word, "luks.uuid=")) { + char **t; + + t = strv_append(arg_proc_cmdline_disks, word + 10); + if (!t) { + log_error("Out of memory"); + r = -ENOMEM; + goto finish; + } + strv_free(arg_proc_cmdline_disks); + arg_proc_cmdline_disks = t; + + } else if (startswith(word, "rd.luks.uuid=")) { + + if (in_initrd()) { + char **t; + + t = strv_append(arg_proc_cmdline_disks, word + 13); + if (!t) { + log_error("Out of memory"); + r = -ENOMEM; + goto finish; + } + strv_free(arg_proc_cmdline_disks); + arg_proc_cmdline_disks = t; + } + + } else if (startswith(word, "luks.") || + (in_initrd() && startswith(word, "rd.luks."))) { + + log_warning("Unknown kernel switch %s. Ignoring.", word); + } + + free(word); + } + + r = 0; + +finish: + free(line); + return r; +} + int main(int argc, char *argv[]) { - FILE *f; + FILE *f = NULL; int r = EXIT_SUCCESS; unsigned n = 0; + char **i; if (argc > 1 && argc != 4) { log_error("This program takes three or no arguments."); @@ -254,6 +360,42 @@ int main(int argc, char *argv[]) { umask(0022); + if (parse_proc_cmdline() < 0) + return EXIT_FAILURE; + + if (!arg_enabled) { + r = EXIT_SUCCESS; + goto finish; + } + + STRV_FOREACH(i, arg_proc_cmdline_disks) { + char *name, *device; + const char *p = *i; + + if (startswith(p, "luks-")) + p += 5; + + name = strappend("luks-", *i); + device = strappend("UUID=", *i); + + if (!name || !device) { + log_error("Out of memory"); + r = EXIT_FAILURE; + free(name); + free(device); + goto finish; + } + + if (create_disk(name, device, NULL, NULL) < 0) + r = EXIT_FAILURE; + + free(name); + free(device); + } + + if (!arg_read_crypttab) + return r; + f = fopen("/etc/crypttab", "re"); if (!f) { @@ -299,5 +441,10 @@ int main(int argc, char *argv[]) { } finish: + if (f) + fclose(f); + + strv_free(arg_proc_cmdline_disks); + return r; } 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; 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); } diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c index e4420eeb1b..05e4971487 100644 --- a/src/quotacheck/quotacheck.c +++ b/src/quotacheck/quotacheck.c @@ -52,8 +52,8 @@ static int parse_proc_cmdline(void) { arg_force = true; else if (strneq(w, "quotacheck.mode=skip", l)) arg_skip = true; - else if (startswith(w, "quotacheck.mode")) - log_warning("Invalid quotacheck.mode= parameter. Ignoring."); + else if (startswith(w, "quotacheck")) + log_warning("Invalid quotacheck parameter. Ignoring."); #if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) else if (strneq(w, "forcequotacheck", l)) arg_force = true;