From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 19 Dec 2019 12:17:31 +0000 (+0100)
Subject: cryptsetup-generator: order after cryptsetup-pre.target unconditionally
X-Git-Tag: v245-rc1~16^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6bbd539e5e7226ff1e2574e42c8bc821b68cfa19;p=thirdparty%2Fsystemd.git

cryptsetup-generator: order after cryptsetup-pre.target unconditionally
---

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index eaa3af6298a..02b2cae5c00 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -299,9 +299,11 @@ static int create_disk(
                 "SourcePath=%s\n"
                 "DefaultDependencies=no\n"
                 "IgnoreOnIsolate=true\n"
-                "After=%s\n",
-                arg_crypttab,
-                netdev ? "remote-fs-pre.target" : "cryptsetup-pre.target");
+                "After=cryptsetup-pre.target\n",
+                arg_crypttab);
+
+        if (netdev)
+                fprintf(f, "After=remote-fs-pre.target\n");
 
         /* If initrd takes care of attaching the disk then it should also detach it during shutdown. */
         if (!attach_in_initrd)