From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Fri, 29 Mar 2013 22:01:12 +0000 (+0000)
Subject: cryptsetup: add RequiresMountsFor for keyfile
X-Git-Tag: v201~98
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ceca950145f35f06938acba62af0c678f896e87d

cryptsetup: add RequiresMountsFor for keyfile

This ensures that the keyfile is available during the opening of the encrypted
device.

Also dropped the explicit ordering Before=local-fs.target, as the containers
are ordered implicitly by their content.
---

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index a8c856f7d..6b9bc554b 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -118,12 +118,17 @@ static int create_disk(
                 fprintf(f,
                         "Before=cryptsetup.target\n");
 
-        if (password && (streq(password, "/dev/urandom") ||
-                         streq(password, "/dev/random") ||
-                         streq(password, "/dev/hw_random")))
-                fputs("After=systemd-random-seed-load.service\n", f);
-        else
-                fputs("Before=local-fs.target\n", f);
+        if (password) {
+                if (streq(password, "/dev/urandom") ||
+                    streq(password, "/dev/random") ||
+                    streq(password, "/dev/hw_random"))
+                        fputs("After=systemd-random-seed-load.service\n", f);
+                else if (!streq(password, "-") &&
+                         !streq(password, "none"))
+                        fprintf(f,
+                                "RequiresMountsFor=%s\n",
+                                password);
+        }
 
         if (is_device_path(u))
                 fprintf(f,