dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-06 08:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

cryptsetup: Fix timeout on dm device.

Browse Source 
Fix a bug in systemd-cryptsetup-generator which caused the drop-in
setting the job timeout for the dm device unit to be written with a
name different than the unit name.

https://bugs.freedesktop.org/show_bug.cgi?id=84409
This commit is contained in:
Hugo Grostabussiat
2014-09-28 03:05:41 +02:00
committed by Lennart Poettering
parent a2726e5ced
commit a6fb0dc138
Notes: Lennart Poettering 2014-10-27 13:23:27 +01:00 
Backport: bugfix
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cryptsetup/cryptsetup-generator.c
View File

@@ -246,7 +246,12 @@ static int create_disk(
}
if (!noauto && !nofail) {
r = write_drop_in(arg_dest, name, 90, "device-timeout",
_cleanup_free_ char *dmname;
dmname = strjoin("dev-mapper-", e, ".device", NULL);
if (!dmname)
return log_oom();
r = write_drop_in(arg_dest, dmname, 90, "device-timeout",
"# Automatically generated by systemd-cryptsetup-generator \n\n"
"[Unit]\nJobTimeoutSec=0");
if (r < 0) {