From: Tom Gundersen <teg@jklm.no>
Date: Mon, 17 Oct 2011 11:01:08 +0000 (+0200)
Subject: cryptsetup-generator: avoid ordering cycle on swap
X-Git-Tag: v38~212
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87e75fddbb3701fd5f4e0d62dc1d661e8d94b071;p=systemd

cryptsetup-generator: avoid ordering cycle on swap

Devices with random keys (swap), should not be ordered before local-fs.target,
as this creates a cycle with systemd-load-random-seed.service (and also it
does not make sense, a swap device is not a local-fs).
---

diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
index 6f3aa786..a48b7a45 100644
--- a/src/cryptsetup-generator.c
+++ b/src/cryptsetup-generator.c
@@ -112,8 +112,7 @@ static int create_disk(
                 "DefaultDependencies=no\n"
                 "BindTo=%s dev-mapper-%%i.device\n"
                 "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
-                "Before=umount.target\n"
-                "Before=local-fs.target\n",
+                "Before=umount.target\n",
                 d, d);
 
         if (!nofail)
@@ -125,6 +124,9 @@ static int create_disk(
                          streq(password, "/dev/hw_random")))
                 fprintf(f,
                         "After=systemd-random-seed-load.service\n");
+        else
+                fprintf(f,
+                        "Before=local-fs.target\n");
 
         fprintf(f,
                 "\n[Service]\n"