c446b5bdf8
- Enable Predictable Network interface names (bnc#829526). - version 207, distribution specific changes follow, for overall release notes see NEWS. - Fixed: * Failed at step PAM spawning /usr/lib/systemd/systemd: Operation not permitted * Fix shutdown hang "a stop job is running for Session 1 of user root" that was reported in opensuse-factory list. - systemd-sysctl no longer reads /etc/sysctl.conf however backward compatbility is to be provides by a symlink created at %post. - removed previously disabled upstream patches (merged): 0002-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch, 0004-disable-the-cgroups-release-agent-when-shutting-down.patch, 0005-cgroups-agent-remove-ancient-fallback-code-turn-conn.patch, 0006-suppress-status-message-output-at-shutdown-when-quie.patch, - removed upstream merged patches: exclude-dev-from-tmpfiles.patch, logind_update_state_file_after_generating_....patch - Add systemd-pam_config.patch: use correct include name for PAM configuration on openSUSE. - Add exclude-dev-from-tmpfiles.patch: allow to exclude /dev from tmpfiles (bnc#835813). OBS-URL: https://build.opensuse.org/request/show/198848 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=155
31 lines
1.3 KiB
Diff
31 lines
1.3 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(-)
|
|
|
|
--- systemd-206_git201308300826.orig/src/cryptsetup/cryptsetup-generator.c
|
|
+++ systemd-206_git201308300826/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\n"
|
|
"After=systemd-readahead-collect.service systemd-readahead-replay.service\n",
|
|
f);
|
|
|
|
--- systemd-206_git201308300826.orig/units/systemd-fsck@.service.in
|
|
+++ systemd-206_git201308300826/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 md.service dmraid.service
|
|
Before=shutdown.target
|
|
|
|
[Service]
|