picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cryptsetup-generator: auto add deps for device as password

Browse source 
If the password is a device file, we can add Requires/After dependencies
on the device rather than requiring the user to do so.
This commit is contained in:
Dave Reisner 2014-02-08 12:54:58 -05:00
parent 2ba110900a
commit 66a5dbdf28
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/cryptsetup/cryptsetup-generator.c
View file

@ -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))