Frederic Crozat
44826cf923
cryptsetup and random-seed-load (bnc#721666). - Add crash-isolating.patch: fix crash when isolating a service. - Fix bootsplash being killed too early. - Fix some manpages not being redirected properly. - Add storage-after-cryptsetup.service to restart lvm after cryptsetup. Fixes lvm on top of LUKS (bnc#724238). - Add avoid-random-seed-cycle.patch: fix dependency cycle between cryptsetup and random-seed-load (bnc#721666). - Add crash-isolating.patch: fix crash when isolating a service. - Fix bootsplash being killed too early. - Fix some manpages not being redirected properly. - Add storage-after-cryptsetup.service to restart lvm after cryptsetup. Fixes lvm on top of LUKS (bnc#724238). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=219
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
|
|
Devices with random keys (swap), should not be ordered before local-fs.target,
|
|
as this creates a cycle with systemd-load-random-seed.service (and also it
|
|
does not make sense, a swap device is not a local-fs).
|
|
---
|
|
src/cryptsetup-generator.c | 6 ++++--
|
|
1 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
|
|
index 6f3aa78..a48b7a4 100644
|
|
--- a/src/cryptsetup-generator.c
|
|
+++ b/src/cryptsetup-generator.c
|
|
@@ -112,8 +112,7 @@ static int create_disk(
|
|
"DefaultDependencies=no\n"
|
|
"BindTo=%s dev-mapper-%%i.device\n"
|
|
"After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
|
|
- "Before=umount.target\n"
|
|
- "Before=local-fs.target\n",
|
|
+ "Before=umount.target\n",
|
|
d, d);
|
|
|
|
if (!nofail)
|
|
@@ -125,6 +124,9 @@ static int create_disk(
|
|
streq(password, "/dev/hw_random")))
|
|
fprintf(f,
|
|
"After=systemd-random-seed-load.service\n");
|
|
+ else
|
|
+ fprintf(f,
|
|
+ "Before=local-fs.target\n");
|
|
|
|
fprintf(f,
|
|
"\n[Service]\n"
|
|
--
|
|
1.7.7
|
|
|
|
_______________________________________________
|
|
systemd-devel mailing list
|
|
systemd-devel@lists.freedesktop.org
|
|
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
|
|
|