72c0c7777a
- Remove force-lvm-restart-after-cryptsetup-target-is-reached.patch and remove additional dependencies on LVM in other patches: LVM has now systemd support, no need to work around it anymore in systemd. OBS-URL: https://build.opensuse.org/request/show/197612 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=426
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Wed, 9 Nov 2011 11:10:49 +0100
|
|
Subject: delay fsck / cryptsetup after md / dmraid are started
|
|
|
|
---
|
|
src/cryptsetup/cryptsetup-generator.c | 1 +
|
|
units/systemd-fsck@.service.in | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- systemd-206.orig/src/cryptsetup/cryptsetup-generator.c
|
|
+++ systemd-206/src/cryptsetup/cryptsetup-generator.c
|
|
@@ -160,6 +160,7 @@ static int create_disk(
|
|
"Conflicts=umount.target\n"
|
|
"DefaultDependencies=no\n"
|
|
"BindsTo=dev-mapper-%i.device\n"
|
|
+ "After=md.service dmraid.service\n"
|
|
"After=systemd-readahead-collect.service systemd-readahead-replay.service\n",
|
|
f);
|
|
|
|
--- systemd-206.orig/units/systemd-fsck@.service.in
|
|
+++ systemd-206/units/systemd-fsck@.service.in
|
|
@@ -10,7 +10,7 @@ Description=File System Check on %f
|
|
Documentation=man:systemd-fsck@.service(8)
|
|
DefaultDependencies=no
|
|
BindsTo=%i.device
|
|
-After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device
|
|
+After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device md.service dmraid.service
|
|
Before=shutdown.target
|
|
|
|
[Service]
|