forked from pool/systemd
58624a23ff
- Update to release 202: + 'systemctl list-jobs' got some polishing. '--type=' argument may now be passed more than once. 'systemctl list-sockets' has been added. + systemd gained a new unit 'systemd-static-nodes.service' that generates static device nodes earlier during boot, and can run in conjunction with udev. + systemd-nspawn now places all containers in the new /machine top-level cgroup directory in the name=systemd hierarchy. + bootchart can now store its data in the journal. + journactl can now take multiple --unit= and --user-unit= switches. + The cryptsetup logic now understands the "luks.key=" kernel command line switch. If a configured key file is missing, it will fallback to prompting the user. - Rebase some patches - Update handle-SYSTEMCTL_OPTIONS-environment-variable.patch to properly handle SYSTEMCTL_OPTIONS - Fix regression in the default for tmp auto-deletion (systemd-tmp-safe-defaults.patch, FATE#314974). - Add chromebook lid switch as a power switch to logind rule to enable suspend on lid close - Update to release 202: + 'systemctl list-jobs' got some polishing. '--type=' argument may now be passed more than once. 'systemctl list-sockets' has been added. + systemd gained a new unit 'systemd-static-nodes.service' OBS-URL: https://build.opensuse.org/request/show/172582 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=365
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]
|