diff options
| -rw-r--r-- | src/cryptsetup/cryptsetup-generator.c | 20 |
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)) |