forked from pool/systemd
a699b1ca34
- Do not provide %{release} for systemd-analyze - Add more conflicts to -mini packages - Disable Predictable Network interface names until it has been reviewed by network team, with /usr/lib/tmpfiles.d/network.conf. - Don't package /usr/lib/firmware/update (not used) (forwarded request 172848 from fcrozat) OBS-URL: https://build.opensuse.org/request/show/172873 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=135
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Wed, 9 Nov 2011 11:10:49 +0100
|
|
Subject: delay fsck / cryptsetup after md / dmraid / lvm are started
|
|
|
|
---
|
|
src/cryptsetup/cryptsetup-generator.c | 1 +
|
|
units/systemd-fsck@.service.in | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
|
|
index 9b8e229..0949287 100644
|
|
--- a/src/cryptsetup/cryptsetup-generator.c
|
|
+++ b/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 lvm.service\n"
|
|
"After=systemd-readahead-collect.service systemd-readahead-replay.service\n",
|
|
f);
|
|
|
|
diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in
|
|
index b3c71eb..c66a411 100644
|
|
--- a/units/systemd-fsck@.service.in
|
|
+++ b/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 lvm.service md.service dmraid.service
|
|
Before=shutdown.target
|
|
|
|
[Service]
|