2011-12-12 16:59:25 +01:00
|
|
|
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(-)
|
|
|
|
|
|
2012-11-02 17:30:32 +01:00
|
|
|
Index: systemd-189/src/cryptsetup/cryptsetup-generator.c
|
Accepting request 101505 from Base:System
- Update to version 39:
+ New systemd-cgtop tool to show control groups by their resource
usage.
+ Linking against libacl for ACLs is optional again.
+ If a group "adm" exists, journal files are automatically owned
by them, thus allow members of this group full access to the
system journal as well as all user journals.
+ The journal now stores the SELinux context of the logging
client for all entries.
+ Add C++ inclusion guards to all public headers.
+ New output mode "cat" in the journal to print only text
messages, without any meta data like date or time.
+ Include tiny X server wrapper as a temporary stop-gap to teach
XOrg udev display enumeration (until XOrg supports udev
hotplugging for display devices).
+ Add new systemd-cat tool for executing arbitrary programs with
STDERR/STDOUT connected to the journal. Can also act as BSD
logger replacement, and does so by default.
+ Optionally store all locally generated coredumps in the journal
along with meta data.
+ systemd-tmpfiles learnt four new commands: n, L, c, b, for
writing short strings to files (for usage for /sys), and for
creating symlinks, character and block device nodes.
+ New unit file option ControlGroupPersistent= to make cgroups
persistent.
+ Support multiple local RTCs in a sane way.
+ No longer monopolize IO when replaying readahead data on
rotating disks.
+ Don't show kernel threads in systemd-cgls anymore, unless
requested with new -k switch. (forwarded request 101496 from fcrozat)
OBS-URL: https://build.opensuse.org/request/show/101505
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=85
2012-01-26 16:00:42 +01:00
|
|
|
===================================================================
|
2012-11-02 17:30:32 +01:00
|
|
|
--- systemd-189.orig/src/cryptsetup/cryptsetup-generator.c
|
|
|
|
|
+++ systemd-189/src/cryptsetup/cryptsetup-generator.c
|
|
|
|
|
@@ -192,6 +192,7 @@ static int create_disk(
|
2011-12-12 16:59:25 +01:00
|
|
|
"DefaultDependencies=no\n"
|
2012-11-02 17:30:32 +01:00
|
|
|
"BindsTo=%s dev-mapper-%%i.device\n"
|
2011-12-12 16:59:25 +01:00
|
|
|
"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);
|
|
|
|
|
|
2012-11-02 17:30:32 +01:00
|
|
|
Index: systemd-189/units/systemd-fsck@.service.in
|
Accepting request 101505 from Base:System
- Update to version 39:
+ New systemd-cgtop tool to show control groups by their resource
usage.
+ Linking against libacl for ACLs is optional again.
+ If a group "adm" exists, journal files are automatically owned
by them, thus allow members of this group full access to the
system journal as well as all user journals.
+ The journal now stores the SELinux context of the logging
client for all entries.
+ Add C++ inclusion guards to all public headers.
+ New output mode "cat" in the journal to print only text
messages, without any meta data like date or time.
+ Include tiny X server wrapper as a temporary stop-gap to teach
XOrg udev display enumeration (until XOrg supports udev
hotplugging for display devices).
+ Add new systemd-cat tool for executing arbitrary programs with
STDERR/STDOUT connected to the journal. Can also act as BSD
logger replacement, and does so by default.
+ Optionally store all locally generated coredumps in the journal
along with meta data.
+ systemd-tmpfiles learnt four new commands: n, L, c, b, for
writing short strings to files (for usage for /sys), and for
creating symlinks, character and block device nodes.
+ New unit file option ControlGroupPersistent= to make cgroups
persistent.
+ Support multiple local RTCs in a sane way.
+ No longer monopolize IO when replaying readahead data on
rotating disks.
+ Don't show kernel threads in systemd-cgls anymore, unless
requested with new -k switch. (forwarded request 101496 from fcrozat)
OBS-URL: https://build.opensuse.org/request/show/101505
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=85
2012-01-26 16:00:42 +01:00
|
|
|
===================================================================
|
2012-11-02 17:30:32 +01:00
|
|
|
--- systemd-189.orig/units/systemd-fsck@.service.in
|
|
|
|
|
+++ systemd-189/units/systemd-fsck@.service.in
|
|
|
|
|
@@ -10,7 +10,7 @@ Description=File System Check on %f
|
|
|
|
|
Documentation=man:systemd-fsck@.service(8)
|
2011-12-12 16:59:25 +01:00
|
|
|
DefaultDependencies=no
|
2012-11-02 17:30:32 +01:00
|
|
|
BindsTo=%i.device
|
2011-12-12 16:59:25 +01:00
|
|
|
-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]
|