cryptsetup: support non-LUKS crypto partitions

[elogind.git] / src / cryptsetup-generator.c

diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
index 792c1f52d7aa0af466083be9dc3af33903971c63..3c3b99de51e26e5aa08824253546c00bb94be1c0 100644 (file)
--- a/src/cryptsetup-generator.c
+++ b/src/cryptsetup-generator.c
@@ -59,7 +59,7 @@ static int create_disk(
                 const char *password,
                 const char *options) {
 
                 const char *password,
                 const char *options) {
 

-        char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL;
+        char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL;

         int r;
         FILE *f = NULL;
 
         int r;
         FILE *f = NULL;
 


@@ -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"
                 "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") ||
                 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"
                 "\n[Service]\n"
                 "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",
+                "ExecStart=" SYSTEMD_CRYPTSETUP_PATH " attach '%s' '%s' '%s' '%s'\n"
+                "ExecStop=" SYSTEMD_CRYPTSETUP_PATH " detach '%s'\n",

                 name, u, strempty(password), strempty(options),
                 name);
 
                 name, u, strempty(password), strempty(options),
                 name);
 


@@ -139,6 +138,11 @@ static int create_disk(
                 goto fail;
         }
 
                 goto fail;
         }
 

+        if (asprintf(&from, "../%s", n) < 0) {
+                r = -ENOMEM;
+                goto fail;
+        }
+

         if (!options || !has_option(options, "noauto")) {
 
                 if (asprintf(&to, "%s/%s.wants/%s", arg_dest, d, n) < 0) {
         if (!options || !has_option(options, "noauto")) {
 
                 if (asprintf(&to, "%s/%s.wants/%s", arg_dest, d, n) < 0) {


@@ -146,11 +150,6 @@ static int create_disk(
                         goto fail;
                 }
 
                         goto fail;
                 }
 

-                if (asprintf(&from, "../%s", n) < 0) {
-                        r = -ENOMEM;
-                        goto fail;
-                }
-

                 mkdir_parents(to, 0755);
 
                 if (symlink(from, to) < 0) {
                 mkdir_parents(to, 0755);
 
                 if (symlink(from, to) < 0) {


@@ -160,12 +159,30 @@ static int create_disk(
                 }
         }
 
                 }
         }
 

+        free(to);
+        to = NULL;
+
+        e = unit_name_escape(name);
+        if (asprintf(&to, "%s/dev-mapper-%s.device.wants/%s", arg_dest, e, n) < 0) {
+                r = -ENOMEM;
+                goto fail;
+        }
+
+        mkdir_parents(to, 0755);
+
+        if (symlink(from, to) < 0) {
+                log_error("Failed to create symlink '%s' to '%s': %m", from, to);
+                r = -errno;
+                goto fail;
+        }
+

         r = 0;
 
 fail:
         free(p);
         free(n);
         free(d);
         r = 0;
 
 fail:
         free(p);
         free(n);
         free(d);

+        free(e);

 
         free(from);
         free(to);
 
         free(from);
         free(to);