2011-12-09 15:44:59 +01:00
|
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
|
|
|
Date: Wed, 9 Nov 2011 11:10:49 +0100
|
2013-09-08 11:05:47 +02:00
|
|
|
Subject: delay fsck / cryptsetup after md / dmraid are started
|
2011-12-09 15:44:59 +01:00
|
|
|
|
|
|
|
---
|
2013-04-13 13:09:53 +02:00
|
|
|
src/cryptsetup/cryptsetup-generator.c | 1 +
|
|
|
|
units/systemd-fsck@.service.in | 2 +-
|
|
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
2011-12-09 15:44:59 +01:00
|
|
|
|
2013-10-02 13:01:24 +02:00
|
|
|
Index: systemd-208/src/cryptsetup/cryptsetup-generator.c
|
|
|
|
===================================================================
|
|
|
|
--- systemd-208.orig/src/cryptsetup/cryptsetup-generator.c
|
|
|
|
+++ systemd-208/src/cryptsetup/cryptsetup-generator.c
|
|
|
|
@@ -119,6 +119,7 @@ static int create_disk(
|
2011-12-09 15:44:59 +01:00
|
|
|
"DefaultDependencies=no\n"
|
2013-04-19 22:31:17 +02:00
|
|
|
"BindsTo=dev-mapper-%i.device\n"
|
2013-10-02 13:01:24 +02:00
|
|
|
"IgnoreOnIsolate=true\n"
|
2013-09-08 11:05:47 +02:00
|
|
|
+ "After=md.service dmraid.service\n"
|
2013-04-19 22:31:17 +02:00
|
|
|
"After=systemd-readahead-collect.service systemd-readahead-replay.service\n",
|
|
|
|
f);
|
2011-12-09 15:44:59 +01:00
|
|
|
|
2013-10-02 13:01:24 +02:00
|
|
|
Index: systemd-208/units/systemd-fsck@.service.in
|
|
|
|
===================================================================
|
2014-02-28 18:10:52 +01:00
|
|
|
--- systemd-280.orig/units/systemd-fsck@.service.in
|
|
|
|
+++ systemd-280/units/systemd-fsck@.service.in
|
|
|
|
@@ -10,7 +10,7 @@
|
2012-10-26 14:34:44 +02:00
|
|
|
Documentation=man:systemd-fsck@.service(8)
|
2011-12-09 15:44:59 +01:00
|
|
|
DefaultDependencies=no
|
2012-10-26 14:34:44 +02:00
|
|
|
BindsTo=%i.device
|
2014-02-28 18:10:52 +01:00
|
|
|
-After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device systemd-fsck-root.service
|
|
|
|
+After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device systemd-fsck-root.service md.service dmraid.service
|
2011-12-09 15:44:59 +01:00
|
|
|
Before=shutdown.target
|
|
|
|
|
|
|
|
[Service]
|
2014-02-28 18:10:52 +01:00
|
|
|
--- systemd-280.orig/units/systemd-fsck-root.service.in
|
|
|
|
+++ systemd-280/units/systemd-fsck-root.service.in
|
|
|
|
@@ -9,7 +9,7 @@
|
|
|
|
Description=File System Check on Root Device
|
|
|
|
Documentation=man:systemd-fsck-root.service(8)
|
|
|
|
DefaultDependencies=no
|
|
|
|
-After=systemd-readahead-collect.service systemd-readahead-replay.service
|
|
|
|
+After=systemd-readahead-collect.service systemd-readahead-replay.service md.service dmraid.service
|
|
|
|
Before=local-fs.target shutdown.target
|
|
|
|
|
|
|
|
ConditionPathIsReadWrite=!/
|