]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
cryptsetup-generator: order after cryptsetup-pre.target unconditionally
authorLennart Poettering <lennart@poettering.net>
Thu, 19 Dec 2019 12:17:31 +0000 (13:17 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 21 Jan 2020 19:23:10 +0000 (20:23 +0100)
src/cryptsetup/cryptsetup-generator.c

index eaa3af6298a52e4888e5e4aea2237c8f6fee6f06..02b2cae5c0086d736b3db1500e69d59c6e86bfb4 100644 (file)
@@ -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)