summaryrefslogtreecommitdiff
path: root/src/cryptsetup/cryptsetup-generator.c
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2014-02-08 12:54:58 -0500
committerDave Reisner <dreisner@archlinux.org>2014-02-08 13:53:02 -0500
commit66a5dbdf282435403f947c2caadd04bb0cdec752 (patch)
tree00717f96d0565cde0e2d5c4dd046039cf79e9a3c /src/cryptsetup/cryptsetup-generator.c
parent2ba110900aca729f7d511c185b62149c4a28a293 (diff)
cryptsetup-generator: auto add deps for device as password
If the password is a device file, we can add Requires/After dependencies on the device rather than requiring the user to do so.
Diffstat (limited to 'src/cryptsetup/cryptsetup-generator.c')
-rw-r--r--src/cryptsetup/cryptsetup-generator.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 9c98f0b617..46ad9b8d60 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -130,11 +130,21 @@ static int create_disk(
streq(password, "/dev/random") ||
streq(password, "/dev/hw_random"))
fputs("After=systemd-random-seed.service\n", f);
- else if (!streq(password, "-") &&
- !streq(password, "none"))
- fprintf(f,
- "RequiresMountsFor=%s\n",
- password);
+
+ else if (!streq(password, "-") && !streq(password, "none")) {
+ _cleanup_free_ char *uu = fstab_node_to_udev_node(password);
+ if (uu == NULL)
+ return log_oom();
+
+ if (is_device_path(uu)) {
+ _cleanup_free_ char *dd = unit_name_from_path(uu, ".device");
+ if (dd == NULL)
+ return log_oom();
+
+ fprintf(f, "After=%1$s\nRequires=%1$s\n", dd);
+ } else
+ fprintf(f, "RequiresMountsFor=%s\n", password);
+ }
}
if (is_device_path(u))