X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcryptsetup-generator.c;h=a2b398dd156f31fa99751c89c78c546a96e06303;hb=4313fc2ceb6aa4dd9b8ddc02be65903cd5e071ac;hp=d1d7bb6954fe5aea47425df84b69063e5a55ae3a;hpb=74715b82cb6a09e10ba3fbd2146cd3285f5e6544;p=elogind.git

diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
index d1d7bb695..a2b398dd1 100644
--- a/src/cryptsetup-generator.c
+++ b/src/cryptsetup-generator.c
@@ -100,9 +100,9 @@ static int create_disk(
                 "[Unit]\n"
                 "Description=Cryptography Setup for %%f\n"
                 "DefaultDependencies=no\n"
-                "BindTo=%s\n"
+                "BindTo=%s dev-mapper-%%i.device\n"
                 "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
-                "Before=dev-mapper-%%i.device shutdown.target\n",
+                "Before=dev-mapper-%%i.device shutdown.target local-fs.target\n",
                 d, d);
 
         if (password && (streq(password, "/dev/urandom") ||
@@ -115,9 +115,8 @@ static int create_disk(
                 "\n[Service]\n"
                 "Type=oneshot\n"
                 "RemainAfterExit=yes\n"
-                "ExecStart=" SYSTEMD_CRYPTSETUP_PATH " %s '%s' '%s' '%s' '%s'\n"
+                "ExecStart=" SYSTEMD_CRYPTSETUP_PATH " attach '%s' '%s' '%s' '%s'\n"
                 "ExecStop=" SYSTEMD_CRYPTSETUP_PATH " detach '%s'\n",
-                options && has_option(options, "swap") ? "format-and-attach" : "attach",
                 name, u, strempty(password), strempty(options),
                 name);
 
@@ -164,7 +163,7 @@ static int create_disk(
         to = NULL;
 
         e = unit_name_escape(name);
-        if (asprintf(&to, "%s/dev-mapper-%s.device.wants/%s", arg_dest, e, n) < 0) {
+        if (asprintf(&to, "%s/dev-mapper-%s.device.requires/%s", arg_dest, e, n) < 0) {
                 r = -ENOMEM;
                 goto fail;
         }