chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: introduce the concept of AssertXYZ= similar to ConditionXYZ=, but fatal for...
[elogind.git]
/
src
/
cryptsetup
/
cryptsetup-generator.c
diff --git
a/src/cryptsetup/cryptsetup-generator.c
b/src/cryptsetup/cryptsetup-generator.c
index 3233e15f4e943d4788e560f01e425789560f3fcc..05ceff443fe1dc80529dd6452230e77de472a28d 100644
(file)
--- a/
src/cryptsetup/cryptsetup-generator.c
+++ b/
src/cryptsetup/cryptsetup-generator.c
@@
-131,7
+131,7
@@
static int create_disk(
"Conflicts=umount.target\n"
"BindsTo=dev-mapper-%i.device\n"
"IgnoreOnIsolate=true\n"
"Conflicts=umount.target\n"
"BindsTo=dev-mapper-%i.device\n"
"IgnoreOnIsolate=true\n"
- "After=
systemd-readahead-collect.service systemd-readahead-replay.service
cryptsetup-pre.target\n",
+ "After=cryptsetup-pre.target\n",
f);
if (!nofail)
f);
if (!nofail)
@@
-246,7
+246,12
@@
static int create_disk(
}
if (!noauto && !nofail) {
}
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) {
"# Automatically generated by systemd-cryptsetup-generator \n\n"
"[Unit]\nJobTimeoutSec=0");
if (r < 0) {
@@
-387,7
+392,7
@@
int main(int argc, char *argv[]) {
if (k == 2 && streq(proc_uuid, device + 5)) {
free(options);
options = strdup(p);
if (k == 2 && streq(proc_uuid, device + 5)) {
free(options);
options = strdup(p);
- if (!
proc_
options) {
+ if (!options) {
log_oom();
goto cleanup;
}
log_oom();
goto cleanup;
}