X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup-generator.c;h=b31329dc09d051b37f1993129662ad93f2a96855;hb=5a8e21785907df7466fef5e1cb54ce3bf99e5362;hp=6b9bc554be39b70dbe6cbc073ffda1909a914106;hpb=ceca950145f35f06938acba62af0c678f896e87d;p=elogind.git

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 6b9bc554b..b31329dc0 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -70,8 +70,8 @@ static int create_disk(
                 const char *password,
                 const char *options) {
 
-        char _cleanup_free_ *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL;
-        FILE _cleanup_fclose_ *f = NULL;
+        _cleanup_free_ char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL;
+        _cleanup_fclose_ FILE *f = NULL;
         bool noauto, nofail;
 
         assert(name);
@@ -213,11 +213,28 @@ static int create_disk(
                 return -errno;
         }
 
+        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)
+                        return r;
+        }
+
         return 0;
 }
 
-static int parse_proc_cmdline(char ***arg_proc_cmdline_disks) {
-        char _cleanup_free_ *line = NULL;
+static int parse_proc_cmdline(char ***arg_proc_cmdline_disks, char **arg_proc_cmdline_keyfile) {
+        _cleanup_free_ char *line = NULL;
         char *w = NULL, *state = NULL;
         int r;
         size_t l;
@@ -232,7 +249,7 @@ static int parse_proc_cmdline(char ***arg_proc_cmdline_disks) {
         }
 
         FOREACH_WORD_QUOTED(w, l, line, state) {
-                char _cleanup_free_ *word = NULL;
+                _cleanup_free_ char *word = NULL;
 
                 word = strndup(w, l);
                 if (!word)
@@ -283,6 +300,21 @@ static int parse_proc_cmdline(char ***arg_proc_cmdline_disks) {
                                         return log_oom();
                         }
 
+                } else if (startswith(word, "luks.key=")) {
+                        *arg_proc_cmdline_keyfile = strdup(word + 9);
+                        if (!*arg_proc_cmdline_keyfile)
+                                return log_oom();
+
+                } else if (startswith(word, "rd.luks.key=")) {
+
+                        if (in_initrd()) {
+                                if (*arg_proc_cmdline_keyfile)
+                                        free(*arg_proc_cmdline_keyfile);
+                                *arg_proc_cmdline_keyfile = strdup(word + 12);
+                                if (!*arg_proc_cmdline_keyfile)
+                                        return log_oom();
+                        }
+
                 } else if (startswith(word, "luks.") ||
                            (in_initrd() && startswith(word, "rd.luks."))) {
 
@@ -296,12 +328,13 @@ static int parse_proc_cmdline(char ***arg_proc_cmdline_disks) {
 }
 
 int main(int argc, char *argv[]) {
-        FILE _cleanup_fclose_ *f = NULL;
+        _cleanup_fclose_ FILE *f = NULL;
         unsigned n = 0;
         int r = EXIT_SUCCESS;
         char **i;
-        char _cleanup_strv_free_ **arg_proc_cmdline_disks_done = NULL;
-        char _cleanup_strv_free_ **arg_proc_cmdline_disks = NULL;
+        _cleanup_strv_free_ char **arg_proc_cmdline_disks_done = NULL;
+        _cleanup_strv_free_ char **arg_proc_cmdline_disks = NULL;
+        _cleanup_free_ char *arg_proc_cmdline_keyfile = NULL;
 
         if (argc > 1 && argc != 4) {
                 log_error("This program takes three or no arguments.");
@@ -317,7 +350,7 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        if (parse_proc_cmdline(&arg_proc_cmdline_disks) < 0)
+        if (parse_proc_cmdline(&arg_proc_cmdline_disks, &arg_proc_cmdline_keyfile) < 0)
                 return EXIT_FAILURE;
 
         if (!arg_enabled)
@@ -335,7 +368,7 @@ int main(int argc, char *argv[]) {
                         }
                 } else for (;;) {
                         char line[LINE_MAX], *l;
-                        char _cleanup_free_ *name = NULL, *device = NULL, *password = NULL, *options = NULL;
+                        _cleanup_free_ char *name = NULL, *device = NULL, *password = NULL, *options = NULL;
                         int k;
 
                         if (!fgets(line, sizeof(line), f))
@@ -360,7 +393,7 @@ int main(int argc, char *argv[]) {
                                   for /etc/crypttab and only generate units for those.
                                 */
                                 STRV_FOREACH(i, arg_proc_cmdline_disks) {
-                                        char _cleanup_free_ *proc_device = NULL, *proc_name = NULL;
+                                        _cleanup_free_ char *proc_device = NULL, *proc_name = NULL;
                                         const char *p = *i;
 
                                         if (startswith(p, "luks-"))
@@ -393,7 +426,7 @@ int main(int argc, char *argv[]) {
                   on the kernel command line and not yet written.
                 */
 
-                char _cleanup_free_ *name = NULL, *device = NULL;
+                _cleanup_free_ char *name = NULL, *device = NULL;
                 const char *p = *i;
 
                 if (startswith(p, "luks-"))
@@ -408,7 +441,7 @@ int main(int argc, char *argv[]) {
                 if (!name || !device)
                         return log_oom();
 
-                if (create_disk(name, device, NULL, "timeout=0") < 0)
+                if (create_disk(name, device, arg_proc_cmdline_keyfile, "timeout=0") < 0)
                         r = EXIT_FAILURE;
         }