Attachment 697945 Details for Bug 861123 – Pass timeout=0 to systemd-cryptsetup in the cryptsetup-generator

[patch] Pass timeout=0 to systemd-cryptsetup in the cryptsetup-generator

1001-Pass-timeout-0-to-systemd-cryptsetup-in-the-cryptset.patch (text/plain), 2.51 KB, created by Fabrice Bellet on 2013-02-15 18:47:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabrice Bellet

Created: 2013-02-15 18:47:43 UTC

Size: 2.51 KB

patch

obsolete

>From af4317fccea08c8bf13f6d04607c75b16c36b705 Mon Sep 17 00:00:00 2001
>From: Fabrice Bellet <fabrice@bellet.info>
>Date: Wed, 13 Feb 2013 23:01:42 +0100
>Subject: [PATCH 1001/1001] Pass timeout=0 to systemd-cryptsetup in the
> cryptsetup-generator
>
>---
> src/cryptsetup/cryptsetup-generator.c | 23 ++++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
>diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
>index d1cd1cd..c1ddc91 100644
>--- a/src/cryptsetup/cryptsetup-generator.c
>+++ b/src/cryptsetup/cryptsetup-generator.c
>@@ -53,7 +53,7 @@ static bool has_option(const char *haystack, const char *needle) {
>                         continue;
>                 }
> 
>-                if (f[l] != 0 && f[l] != ',') {
>+                if (f[l] != 0 && f[l] != ',' && f[l] != '=') {
>                         f++;
>                         continue;
>                 }
>@@ -70,7 +70,7 @@ static int create_disk(
>                 const char *password,
>                 const char *options) {
> 
>-        char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL;
>+        char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL, *o = NULL;
>         int r;
>         FILE *f = NULL;
> 	FILE *fd = NULL;
>@@ -137,6 +137,22 @@ static int create_disk(
>         else
>                 fputs("Before=local-fs.target\n", f);
> 
>+        if (options && strlen(options))
>+            if (has_option(options, "timeout"))
>+                o = strdup (options);
>+            else
>+                if (streq(options, "none"))
>+                    o = strdup("timeout=0");
>+                else
>+                    o = strjoin(options, ",timeout=0", NULL);
>+        else
>+            o = strdup("timeout=0");
>+
>+        if (!o) {
>+            r = log_oom();
>+            goto fail;
>+        }
>+
>         fprintf(f,
>                 "\n[Service]\n"
>                 "Type=oneshot\n"
>@@ -144,7 +160,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), o,
>                 name);
> 
>         if (has_option(options, "tmp"))
>@@ -253,6 +269,7 @@ static int create_disk(
>         r = 0;
> 
> fail:
>+        free(o);
>         free(p);
>         free(n);
>         free(d);
>-- 
>1.8.1.2
>

Actions: View | Diff

Attachments on bug 861123: 629364 | 629475 | 629480 | 629835 | 633012 | 633014 | 633048 | 697944 | 697945