X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup-generator.c;h=75d56ddafa4d6937b0f07fa4f102417d8c86ab7b;hp=38c746b8bbe96307964f6d04a290fb58b59f10f0;hb=c3834f9b881f2b1a68dc7d797c134f0b66b47b57;hpb=141a79f491fd4bf5ea0d66039065c9f9649bfc0e diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 38c746b8b..75d56ddaf 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -33,11 +33,9 @@ static const char *arg_dest = "/tmp"; static bool arg_enabled = true; static bool arg_read_crypttab = true; - -static char **arg_disks; -static char **arg_options; -static char *arg_keyfile; - +static char **arg_disks = NULL; +static char **arg_options = NULL; +static char *arg_keyfile = NULL; static bool has_option(const char *haystack, const char *needle) { const char *f = haystack; @@ -74,9 +72,11 @@ static int create_disk( const char *password, const char *options) { - _cleanup_free_ char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL; + _cleanup_free_ char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *to = NULL, *e = NULL; _cleanup_fclose_ FILE *f = NULL; bool noauto, nofail, tmp, swap; + char *from; + int r; assert(name); assert(device); @@ -91,7 +91,11 @@ static int create_disk( return -EINVAL; } - n = unit_name_from_path_instance("systemd-cryptsetup", name, ".service"); + e = unit_name_escape(name); + if (!e) + return log_oom(); + + n = unit_name_build("systemd-cryptsetup", e, ".service"); if (!n) return log_oom(); @@ -117,10 +121,10 @@ 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" - "Conflicts=umount.target\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", @@ -131,19 +135,20 @@ static int create_disk( "Before=cryptsetup.target\n"); if (password) { - if (streq(password, "/dev/urandom") || - streq(password, "/dev/random") || - streq(password, "/dev/hw_random")) + if (STR_IN_SET(password, "/dev/urandom", "/dev/random", "/dev/hw_random")) fputs("After=systemd-random-seed.service\n", f); - else if (!streq(password, "-") && !streq(password, "none")) { - _cleanup_free_ char *uu = fstab_node_to_udev_node(password); - if (uu == NULL) + _cleanup_free_ char *uu; + + uu = fstab_node_to_udev_node(password); + if (!uu) return log_oom(); if (is_device_path(uu)) { - _cleanup_free_ char *dd = unit_name_from_path(uu, ".device"); - if (dd == NULL) + _cleanup_free_ char *dd; + + dd = unit_name_from_path(uu, ".device"); + if (!dd) return log_oom(); fprintf(f, "After=%1$s\nRequires=%1$s\n", dd); @@ -184,14 +189,12 @@ static int create_disk( name); fflush(f); - if (ferror(f)) { log_error("Failed to write file %s: %m", p); return -errno; } - if (asprintf(&from, "../%s", n) < 0) - return log_oom(); + from = strappenda("../", n); if (!noauto) { @@ -220,10 +223,6 @@ static int create_disk( } } - e = unit_name_escape(name); - if (!e) - return log_oom(); - free(to); to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL); if (!to) @@ -236,104 +235,64 @@ static int create_disk( } if (!noauto && !nofail) { - int r; + 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 */ - if (r) + if (r < 0) { + log_error("Failed to write device drop-in: %s", strerror(-r)); return r; + } } 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=")) { + } else if (STR_IN_SET(key, "luks.crypttab", "rd.luks.crypttab") && value) { - 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); + 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=")) { + } else if (STR_IN_SET(key, "luks.options", "rd.luks.options") && value) { - if (in_initrd()) { - if (strv_extend(&arg_disks, word + 13) < 0) - return log_oom(); - } - - } 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=")) { + } else if (STR_IN_SET(key, "luks.key", "rd.luks.key") && value) { - if (in_initrd()) { - if (strv_extend(&arg_options, word + 16) < 0) - return log_oom(); - } - - } else if (startswith(word, "luks.key=")) { free(arg_keyfile); - arg_keyfile = strdup(word + 9); + arg_keyfile = strdup(key); 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); - } + } else if (startswith(key, "luks.") || startswith(key, "rd.luks.")) + log_warning("Unknown kernel switch %s. Ignoring.", key); return 0; } @@ -359,7 +318,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) { @@ -509,13 +468,9 @@ next: k = sscanf(s, "%m[0-9a-fA-F-]=%ms", &proc_uuid, &proc_options); if (k == 2) { if (streq(proc_uuid, device + 5)) { - if (options) - free(options); - options = strdup(proc_options); - if (!options) { - log_oom(); - goto cleanup; - } + free(options); + options = proc_options; + proc_options = NULL; } } else if (!options) { /*