sd-dhcp6-client: Initialize fd to -1 and rename function

[elogind.git] / src / cryptsetup / cryptsetup-generator.c

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 9460e83fd18d0b84f931bd853583e203538ffb44..dfdca1e47b4e3ce82ddf7fd6027a5f89e748b5d8 100644 (file)
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -121,13 +121,13 @@ static int create_disk(
                 "# Automatically generated by systemd-cryptsetup-generator\n\n"
                 "[Unit]\n"
                 "Description=Cryptography Setup for %I\n"
-                "Documentation=man:systemd-cryptsetup@.service(8) man:crypttab(5)\n"
+                "Documentation=man:crypttab(5) man:systemd-cryptsetup-generator(8) man:systemd-cryptsetup@.service(8)\n"
                 "SourcePath=/etc/crypttab\n"
                 "DefaultDependencies=no\n"
                 "Conflicts=umount.target\n"
                 "BindsTo=dev-mapper-%i.device\n"
                 "IgnoreOnIsolate=true\n"
-                "After=systemd-readahead-collect.service systemd-readahead-replay.service\n",
+                "After=systemd-readahead-collect.service systemd-readahead-replay.service cryptsetup-pre.target\n",
                 f);
 
         if (!nofail)
@@ -287,7 +287,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
         } else if (STR_IN_SET(key, "luks.key", "rd.luks.key") && value) {
 
                 free(arg_keyfile);
-                arg_keyfile = strdup(key);
+                arg_keyfile = strdup(value);
                 if (!arg_keyfile)
                         return log_oom();