]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
cryptsetup: Add dependency on loopback setup to generated units
authorLorenz Hübschle-Schneider <dev@4z2.de>
Tue, 26 Jun 2018 17:41:30 +0000 (19:41 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 27 Jun 2018 14:57:17 +0000 (16:57 +0200)
For loopback volumes, the generated unit needs to depend on
systemd-tmpfiles-setup-dev.service to ensure that loopback
support is loaded.

Fixes #9308

src/cryptsetup/cryptsetup-generator.c

index f5a81829b9d75ec05b25fa3a5c919b85c2f4666d..d8e65c0098e8de287454ac0c514f7074a5b74e49 100644 (file)
@@ -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);