X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup-generator.c;h=3233e15f4e943d4788e560f01e425789560f3fcc;hb=1c9633d669948155455e29b0c6e770995a8b1ca3;hp=d2e055431eccdd66f6947270d64e428f5c3f86c2;hpb=744198e92501e9d98047ef6b0f7e8da3597a1f0f;p=elogind.git diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index d2e055431..3233e15f4 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -29,6 +29,9 @@ #include "mkdir.h" #include "strv.h" #include "fileio.h" +#include "path-util.h" +#include "dropin.h" +#include "generator.h" static const char *arg_dest = "/tmp"; static bool arg_enabled = true; @@ -72,7 +75,8 @@ static int create_disk( const char *password, const char *options) { - _cleanup_free_ char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *to = NULL, *e = NULL; + _cleanup_free_ char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *to = NULL, *e = NULL, + *filtered = NULL; _cleanup_fclose_ FILE *f = NULL; bool noauto, nofail, tmp, swap; char *from; @@ -121,13 +125,13 @@ static int create_disk( "# Automatically generated by systemd-cryptsetup-generator\n\n" "[Unit]\n" "Description=Cryptography Setup for %I\n" - "Documentation=man:systemd-cryptsetup@.service(8) man:crypttab(5)\n" + "Documentation=man:crypttab(5) man:systemd-cryptsetup-generator(8) man:systemd-cryptsetup@.service(8)\n" "SourcePath=/etc/crypttab\n" "DefaultDependencies=no\n" "Conflicts=umount.target\n" "BindsTo=dev-mapper-%i.device\n" "IgnoreOnIsolate=true\n" - "After=systemd-readahead-collect.service systemd-readahead-replay.service\n", + "After=systemd-readahead-collect.service systemd-readahead-replay.service cryptsetup-pre.target\n", f); if (!nofail) @@ -144,16 +148,19 @@ static int create_disk( if (!uu) return log_oom(); - if (is_device_path(uu)) { - _cleanup_free_ char *dd; + if (!path_equal(uu, "/dev/null")) { - dd = unit_name_from_path(uu, ".device"); - if (!dd) - return log_oom(); + if (is_device_path(uu)) { + _cleanup_free_ char *dd; - fprintf(f, "After=%1$s\nRequires=%1$s\n", dd); - } else - fprintf(f, "RequiresMountsFor=%s\n", password); + dd = unit_name_from_path(uu, ".device"); + if (!dd) + return log_oom(); + + fprintf(f, "After=%1$s\nRequires=%1$s\n", dd); + } else + fprintf(f, "RequiresMountsFor=%s\n", password); + } } } @@ -168,6 +175,10 @@ static int create_disk( "RequiresMountsFor=%s\n", u); + r = generator_write_timeouts(arg_dest, device, name, options, &filtered); + if (r < 0) + return r; + fprintf(f, "\n[Service]\n" "Type=oneshot\n" @@ -175,7 +186,7 @@ static int create_disk( "TimeoutSec=0\n" /* the binary handles timeouts anyway */ "ExecStart=" SYSTEMD_CRYPTSETUP_PATH " attach '%s' '%s' '%s' '%s'\n" "ExecStop=" SYSTEMD_CRYPTSETUP_PATH " detach '%s'\n", - name, u, strempty(password), strempty(options), + name, u, strempty(password), strempty(filtered), name); if (tmp) @@ -235,17 +246,9 @@ static int create_disk( } if (!noauto && !nofail) { - - free(p); - p = strjoin(arg_dest, "/dev-mapper-", e, ".device.d/50-job-timeout-sec-0.conf", NULL); - if (!p) - return log_oom(); - - mkdir_parents_label(p, 0755); - r = write_string_file(p, - "# Automatically generated by systemd-cryptsetup-generator\n\n" - "[Unit]\n" - "JobTimeoutSec=0\n"); /* the binary handles timeouts anyway */ + r = write_drop_in(arg_dest, name, 90, "device-timeout", + "# Automatically generated by systemd-cryptsetup-generator \n\n" + "[Unit]\nJobTimeoutSec=0"); if (r < 0) { log_error("Failed to write device drop-in: %s", strerror(-r)); return r; @@ -255,84 +258,42 @@ static int create_disk( return 0; } -static int parse_proc_cmdline_word(const char *word) { +static int parse_proc_cmdline_item(const char *key, const char *value) { int r; - if (startswith(word, "luks=")) { - r = parse_boolean(word + 5); + if (STR_IN_SET(key, "luks", "rd.luks") && value) { + + r = parse_boolean(value); if (r < 0) - log_warning("Failed to parse luks switch %s. Ignoring.", word + 5); + log_warning("Failed to parse luks switch %s. Ignoring.", value); 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 (STR_IN_SET(key, "luks.crypttab", "rd.luks.crypttab") && value) { - } else if (startswith(word, "luks.crypttab=")) { - r = parse_boolean(word + 14); + r = parse_boolean(value); if (r < 0) - log_warning("Failed to parse luks crypttab switch %s. Ignoring.", word + 14); + log_warning("Failed to parse luks crypttab switch %s. Ignoring.", value); 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 (STR_IN_SET(key, "luks.uuid", "rd.luks.uuid") && value) { - } else if (startswith(word, "luks.uuid=")) { - if (strv_extend(&arg_disks, word + 10) < 0) + if (strv_extend(&arg_disks, value) < 0) return log_oom(); - } else if (startswith(word, "rd.luks.uuid=")) { - - if (in_initrd()) { - if (strv_extend(&arg_disks, word + 13) < 0) - return log_oom(); - } + } else if (STR_IN_SET(key, "luks.options", "rd.luks.options") && value) { - } else if (startswith(word, "luks.options=")) { - if (strv_extend(&arg_options, word + 13) < 0) + if (strv_extend(&arg_options, value) < 0) return log_oom(); - } else if (startswith(word, "rd.luks.options=")) { - - if (in_initrd()) { - if (strv_extend(&arg_options, word + 16) < 0) - return log_oom(); - } + } else if (STR_IN_SET(key, "luks.key", "rd.luks.key") && value) { - } else if (startswith(word, "luks.key=")) { free(arg_keyfile); - arg_keyfile = strdup(word + 9); + arg_keyfile = strdup(value); if (!arg_keyfile) return log_oom(); - } else if (startswith(word, "rd.luks.key=")) { - - if (in_initrd()) { - free(arg_keyfile); - arg_keyfile = strdup(word + 12); - if (!arg_keyfile) - return log_oom(); - } - - } else if (startswith(word, "luks.") || - (in_initrd() && startswith(word, "rd.luks."))) { - - log_warning("Unknown kernel switch %s. Ignoring.", word); } return 0; @@ -359,7 +320,7 @@ int main(int argc, char *argv[]) { umask(0022); - if (parse_proc_cmdline(parse_proc_cmdline_word) < 0) + if (parse_proc_cmdline(parse_proc_cmdline_item) < 0) goto cleanup; if (!arg_enabled) {