X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fcryptsetup-generator.c;fp=src%2Fcryptsetup-generator.c;h=73c367935f57763cc0355f19b893e42576a3d45a;hb=7f4e08056de0184b205a20632e62db73d299937e;hp=792c1f52d7aa0af466083be9dc3af33903971c63;hpb=5a1e99375d03bc88795d68c66bf3933dd04c1015;p=elogind.git

diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
index 792c1f52d..73c367935 100644
--- a/src/cryptsetup-generator.c
+++ b/src/cryptsetup-generator.c
@@ -102,7 +102,7 @@ static int create_disk(
                 "DefaultDependencies=no\n"
                 "BindTo=%s\n"
                 "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
-                "Before=dev-mapper-%%f.device shutdown.target\n",
+                "Before=dev-mapper-%%i.device shutdown.target\n",
                 d, d);
 
         if (password && (streq(password, "/dev/urandom") ||
@@ -116,8 +116,8 @@ static int create_disk(
                 "Type=oneshot\n"
                 "RemainAfterExit=yes\n"
                 "ExecStart=" SYSTEMD_CRYPTSETUP_PATH " %s '%s' '%s' '%s' '%s'\n"
-                "ExecStop=" SYSTEMD_CRYPTSETUP_PATH " remove '%s'\n",
-                options && has_option(options, "swap") ? "format" : "create",
+                "ExecStop=" SYSTEMD_CRYPTSETUP_PATH " detach '%s'\n",
+                options && has_option(options, "swap") ? "format-and-attach" : "attach",
                 name, u, strempty(password), strempty(options),
                 name);