From: Lorenz Hübschle-Schneider <dev@4z2.de>
Date: Tue, 26 Jun 2018 17:41:30 +0000 (+0200)
Subject: cryptsetup: Add dependency on loopback setup to generated units
X-Git-Tag: v240~1029
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b90cbe6638560b9e42343e705a561b73b6dca39f;p=thirdparty%2Fsystemd.git

cryptsetup: Add dependency on loopback setup to generated units

For loopback volumes, the generated unit needs to depend on
systemd-tmpfiles-setup-dev.service to ensure that loopback
support is loaded.

Fixes #9308
---

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index f5a81829b9d..d8e65c0098e 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -151,8 +151,13 @@ static int create_disk(
                         fputs("Before=dev-mapper-%i.swap\n",
                               f);
         } else
+                /* For loopback devices, add systemd-tmpfiles-setup-dev.service
+                   dependency to ensure that loopback support is available in
+                   the kernel (/dev/loop-control needs to exist) */
                 fprintf(f,
-                        "RequiresMountsFor=%s\n",
+                        "RequiresMountsFor=%s\n"
+                        "Requires=systemd-tmpfiles-setup-dev.service\n"
+                        "After=systemd-tmpfiles-setup-dev.service\n",
                         u_escaped);
 
         r = generator_write_timeouts(arg_dest, device, name, options, &filtered);