forked from pool/systemd
Frederic Crozat
9bf0c2c838
- Remove storage-after-cryptsetup.service, add
storage-after-cryptsetup.patch instead to prevent dependency
cycle (bnc#722539).
- Add delay-fsck-cryptsetup-after-md-lvm-dmraid.patch: ensure
fsck/cryptsetup is run after lvm/md/dmraid have landed
(bnc#724912).
- Add cron-tty-pam.patch: Fix cron filling logs (bnc#731358).
- Add do_not_warn_pidfile.patch: Fix PID warning in logs
(bnc#732912).
- Add mount-swap-log.patch: Ensure swap and mount output is
redirected to default log target (rhb#750032).
- Add color-on-boot.patch: ensure colored status are displayed at
boot time.
- Update modules_on_boot.patch to fix bnc#732041.
- Replace private_tmp_crash.patch with log_on_close.patch, better
upstream fix for bnc#699829 and fix bnc#731719.
- Update vconsole patch to fix memleaks and crash (bnc#734527).
- Add handle-racy-daemon.patch: fix warnings with sendmail
(bnc#732912).
- Add new-lsb-headers.patch: support PIDFile: and
X-Systemd-RemainAfterExit: header in initscript (bnc#727771).
- Update bootsplash services to not start if vga= is missing from
cmdline (bnc#727771)
- Add lock-opensuse.patch: disable /var/lock/{subsys,lockdev} and
change default permissions on /var/lock (bnc#733523).
- Add garbage_collect_units: ensure error units are correctly
garbage collected (rhb#680122).
- Add crypt-loop-file.patch: add support for crypt file loop
(bnc#730496).
OBS-URL: https://build.opensuse.org/request/show/96123
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=228
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From c6170719e7afbcecc04e8939e93e9678529e6391 Mon Sep 17 00:00:00 2001
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Wed, 9 Nov 2011 11:10:49 +0100
|
|
Subject: [PATCH] delay fsck / cryptsetup after md / dmraid / lvm are started
|
|
|
|
---
|
|
src/cryptsetup-generator.c | 1 +
|
|
units/fsck@.service.in | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
|
|
index 14fcce8..e62f0e0 100644
|
|
--- a/src/cryptsetup-generator.c
|
|
+++ b/src/cryptsetup-generator.c
|
|
@@ -186,6 +186,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"
|
|
+ "After=md.service dmraid.service lvm.service\n"
|
|
"Before=umount.target\n",
|
|
d, d);
|
|
|
|
diff --git a/units/fsck@.service.in b/units/fsck@.service.in
|
|
index e1f7736..c1870ce 100644
|
|
--- a/units/fsck@.service.in
|
|
+++ b/units/fsck@.service.in
|
|
@@ -9,7 +9,7 @@
|
|
Description=File System Check on %f
|
|
DefaultDependencies=no
|
|
BindTo=%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]
|
|
--
|
|
1.7.7
|
|
|