Attachment 697944 Details for Bug 861123 – Add a JobTimeoutSec=0 for the dev-mapper device unit file in the cryptsetup generator

[patch] Add a JobTimeoutSec=0 for the dev-mapper device unit file in the cryptsetup generator

1000-Add-a-JobTimeoutSec-0-for-the-dev-mapper-device-unit.patch (text/plain), 1.77 KB, created by Fabrice Bellet on 2013-02-15 18:46:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabrice Bellet

Created: 2013-02-15 18:46:46 UTC

Size: 1.77 KB

patch

obsolete

>From 6503fe9cf62c99c792f206c98677c1af49d5d20e Mon Sep 17 00:00:00 2001
>From: Fabrice Bellet <fabrice@bellet.info>
>Date: Wed, 13 Feb 2013 17:46:27 +0100
>Subject: [PATCH 1000/1001] Add a JobTimeoutSec=0 for the dev-mapper device
> unit file in the cryptsetup generator
>
>---
> src/cryptsetup/cryptsetup-generator.c | 33 +++++++++++++++++++++++++++++++++
> 1 file changed, 33 insertions(+)
>
>diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
>index 6e7b707..d1cd1cd 100644
>--- a/src/cryptsetup/cryptsetup-generator.c
>+++ b/src/cryptsetup/cryptsetup-generator.c
>@@ -73,6 +73,7 @@ static int create_disk(
>         char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL;
>         int r;
>         FILE *f = NULL;
>+	FILE *fd = NULL;
>         bool noauto, nofail;
> 
>         assert(name);
>@@ -220,6 +221,35 @@ static int create_disk(
>                 goto fail;
>         }
> 
>+	free (p);
>+	p = strjoin(arg_dest, "/dev-mapper-", e, ".device", NULL);
>+
>+	if (!p) {
>+                r = log_oom();
>+                goto fail;
>+		
>+	}
>+
>+        fd = fopen(p, "wxe");
>+        if (!fd) {
>+                r = -errno;
>+                log_error("Failed to create unit file %s: %m", p);
>+                goto fail;
>+        }
>+
>+        fprintf(fd,
>+                "# Automatically generated by systemd-cryptsetup-generator\n\n"
>+                "[Unit]\n"
>+                "JobTimeoutSec=0\n");
>+
>+        fflush(fd);
>+
>+        if (ferror(fd)) {
>+                r = -errno;
>+                log_error("Failed to write file %s: %m", p);
>+                goto fail;
>+        }
>+
>         r = 0;
> 
> fail:
>@@ -234,6 +264,9 @@ fail:
>         if (f)
>                 fclose(f);
> 
>+        if (fd)
>+                fclose(fd);
>+
>         return r;
> }
> 
>-- 
>1.8.1.2
>

Actions: View | Diff

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