forked from pool/systemd
bbba62be60
- Add or port upstream bugfix patches: 0001-Fix-systemd-stdio-bridge-symlink.patch 0002-execute-free-directory-path-if-we-fail-to-remove-it-.patch 0003-Do-not-print-invalid-UTF-8-in-error-messages.patch 0004-man-document-missing-options-of-systemd-run.patch 0005-systemd-run-add-some-extra-safety-checks.patch 0006-journal-assume-that-next-entry-is-after-previous-ent.patch 0007-journal-forget-file-after-encountering-an-error.patch 0008-core-correctly-unregister-PIDs-from-PID-hashtables.patch 0009-logind-fix-reference-to-systemd-user-sessions.servic.patch 0010-man-update-link-to-LSB.patch 0011-man-systemd-bootchart-fix-spacing-in-command.patch 0012-man-add-missing-comma.patch 0013-units-Do-not-unescape-instance-name-in-systemd-backl.patch - Add linker scripts as place holder of the old systemd shared libraries now all included in libsystemd.so (bnc#867128) - Make patch 1006-udev-always-rename-network.patch work again and add it again. - address missing owner functionality in systemd-tmpfiles (fate#314974) 1022-systemd-tmpfiles-ownerkeep.patch - Generate the bash completion files on the fly for the case of not having the package bash-completion around - Add or port upstream bugfix patches: 0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch 0002-cdrom_id-use-the-old-MMC-fallback.patch 0003-journalctl-refuse-extra-arguments-with-verify-and-si.patch OBS-URL: https://build.opensuse.org/request/show/225408 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=177
46 lines
1.9 KiB
Diff
46 lines
1.9 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(-)
|
|
|
|
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(
|
|
"DefaultDependencies=no\n"
|
|
"BindsTo=dev-mapper-%i.device\n"
|
|
"IgnoreOnIsolate=true\n"
|
|
+ "After=md.service dmraid.service\n"
|
|
"After=systemd-readahead-collect.service systemd-readahead-replay.service\n",
|
|
f);
|
|
|
|
Index: systemd-208/units/systemd-fsck@.service.in
|
|
===================================================================
|
|
--- systemd-280.orig/units/systemd-fsck@.service.in
|
|
+++ systemd-280/units/systemd-fsck@.service.in
|
|
@@ -10,7 +10,7 @@
|
|
Documentation=man:systemd-fsck@.service(8)
|
|
DefaultDependencies=no
|
|
BindsTo=%i.device
|
|
-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
|
|
Before=shutdown.target
|
|
|
|
[Service]
|
|
--- 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=!/
|