X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup-generator.c;h=b27223cd6c235765bd4559dc1479a14a089d2bcd;hp=9460e83fd18d0b84f931bd853583e203538ffb44;hb=56f64d95763a799ba4475daf44d8e9f72a1bd474;hpb=059cb3858acd038ff2cef10a3a99119bf71a8fc6 diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 9460e83fd..b27223cd6 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; @@ -113,7 +117,7 @@ static int create_disk( f = fopen(p, "wxe"); if (!f) { - log_error("Failed to create unit file %s: %m", p); + log_error_errno(errno, "Failed to create unit file %s: %m", p); return -errno; } @@ -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=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) @@ -190,7 +201,7 @@ static int create_disk( fflush(f); if (ferror(f)) { - log_error("Failed to write file %s: %m", p); + log_error_errno(errno, "Failed to write file %s: %m", p); return -errno; } @@ -204,7 +215,7 @@ static int create_disk( mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { - log_error("Failed to create symlink %s: %m", to); + log_error_errno(errno, "Failed to create symlink %s: %m", to); return -errno; } @@ -218,7 +229,7 @@ static int create_disk( mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { - log_error("Failed to create symlink %s: %m", to); + log_error_errno(errno, "Failed to create symlink %s: %m", to); return -errno; } } @@ -230,26 +241,21 @@ static int create_disk( mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { - log_error("Failed to create symlink %s: %m", to); + log_error_errno(errno, "Failed to create symlink %s: %m", to); return -errno; } if (!noauto && !nofail) { - - free(p); - p = strjoin(arg_dest, "/dev-mapper-", e, ".device.d/50-job-timeout-sec-0.conf", NULL); - if (!p) + _cleanup_free_ char *dmname; + dmname = strjoin("dev-mapper-", e, ".device", NULL); + if (!dmname) 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 < 0) { - log_error("Failed to write device drop-in: %s", strerror(-r)); - return r; - } + r = write_drop_in(arg_dest, dmname, 90, "device-timeout", + "# Automatically generated by systemd-cryptsetup-generator \n\n" + "[Unit]\nJobTimeoutSec=0"); + if (r < 0) + return log_error_errno(r, "Failed to write device drop-in: %m"); } return 0; @@ -287,12 +293,11 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { } else if (STR_IN_SET(key, "luks.key", "rd.luks.key") && value) { free(arg_keyfile); - arg_keyfile = strdup(key); + arg_keyfile = strdup(value); if (!arg_keyfile) return log_oom(); - } else if (startswith(key, "luks.") || startswith(key, "rd.luks.")) - log_warning("Unknown kernel switch %s. Ignoring.", key); + } return 0; } @@ -301,7 +306,7 @@ int main(int argc, char *argv[]) { _cleanup_strv_free_ char **disks_done = NULL; _cleanup_fclose_ FILE *f = NULL; unsigned n = 0; - int r = EXIT_FAILURE, r2 = EXIT_FAILURE; + int r = EXIT_FAILURE, r2 = EXIT_FAILURE, z; char **i; if (argc > 1 && argc != 4) { @@ -318,8 +323,9 @@ int main(int argc, char *argv[]) { umask(0022); - if (parse_proc_cmdline(parse_proc_cmdline_item) < 0) - goto cleanup; + z = parse_proc_cmdline(parse_proc_cmdline_item); + if (z < 0) + log_warning_errno(z, "Failed to parse kernel command line, ignoring: %m"); if (!arg_enabled) { r = r2 = EXIT_SUCCESS; @@ -336,13 +342,13 @@ int main(int argc, char *argv[]) { if (errno == ENOENT) r = EXIT_SUCCESS; else - log_error("Failed to open /etc/crypttab: %m"); + log_error_errno(errno, "Failed to open /etc/crypttab: %m"); goto next; } if (fstat(fileno(f), &st) < 0) { - log_error("Failed to stat /etc/crypttab: %m"); + log_error_errno(errno, "Failed to stat /etc/crypttab: %m"); goto next; } @@ -374,7 +380,7 @@ int main(int argc, char *argv[]) { } /* - If options are specified on the kernel commandline, let them override + If options are specified on the kernel command line, let them override the ones from crypttab. */ STRV_FOREACH(i, arg_options) { @@ -385,7 +391,7 @@ int main(int argc, char *argv[]) { if (k == 2 && streq(proc_uuid, device + 5)) { free(options); options = strdup(p); - if (!proc_options) { + if (!options) { log_oom(); goto cleanup; } @@ -456,7 +462,7 @@ next: if (arg_options) { /* - If options are specified on the kernel commandline, use them. + If options are specified on the kernel command line, use them. */ char **j;