From 389ae520de71504d5349b34b249da1dedf535117f1a6ad8b75f6e96b61f9d781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= <ptesarik@suse.com>
Date: Fri, 4 May 2018 11:31:39 +0000
Subject: [PATCH] - kdump-block-initrd-parse-etc.service.patch: Block  
 initrd-parse-etc.service until dump is saved (bsc#1091186).

OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=168
---
 kdump-block-initrd-parse-etc.service.patch | 37 ++++++++++++++++++++++
 kdump.changes                              |  6 ++++
 kdump.spec                                 |  2 ++
 3 files changed, 45 insertions(+)
 create mode 100644 kdump-block-initrd-parse-etc.service.patch

diff --git a/kdump-block-initrd-parse-etc.service.patch b/kdump-block-initrd-parse-etc.service.patch
new file mode 100644
index 0000000..8cf548e
--- /dev/null
+++ b/kdump-block-initrd-parse-etc.service.patch
@@ -0,0 +1,37 @@
+From: Petr Tesarik <ptesarik@suse.com>
+Date: Fri, 4 May 2018 12:55:44 +0200
+Subject: Block initrd-parse-etc.service until dump is saved
+References: bsc#1091186
+Upstream: merged
+Git-commit: ac14396b33a7d507a65999aa7f70668f9cd15e8e
+
+During boot, custom services like kdump-save.service run in parallel
+with other generic initrd services up until initrd.target. However,
+a reload from real root may change the dependency graph in a way
+that prevents kdump-save.service from finishing. Since kdump needs
+only the explicitly listed mount points, boot process may pause
+while the dump is being saved. In fact, it is preferable to do so,
+lest other processes interfere with kdump itself in the restricted
+environment.
+
+Signed-off-by: Petr Tesarik <ptesarik@suse.com>
+---
+ init/kdump-save.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/init/kdump-save.service.in b/init/kdump-save.service.in
+index 7879dc2..a4d6a65 100644
+--- a/init/kdump-save.service.in
++++ b/init/kdump-save.service.in
+@@ -11,7 +11,7 @@
+ Description=save kernel crash dump
+ Documentation=man:kdump(7)
+ RequiresMountsFor=@KDUMP_MOUNTPOINTS@
+-Before=initrd-cleanup.service
++Before=initrd-parse-etc.service
+ ConditionPathExists=/etc/initrd-release
+ ConditionPathExists=/proc/vmcore
+ 
+-- 
+2.13.6
+
diff --git a/kdump.changes b/kdump.changes
index 608fb9c..906bea1 100644
--- a/kdump.changes
+++ b/kdump.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May  4 11:30:46 UTC 2018 - ptesarik@suse.com
+
+- kdump-block-initrd-parse-etc.service.patch: Block
+  initrd-parse-etc.service until dump is saved (bsc#1091186).
+
 -------------------------------------------------------------------
 Fri May  4 08:13:39 UTC 2018 - ptesarik@suse.com
 
diff --git a/kdump.spec b/kdump.spec
index e6f18e9..89a6a96 100644
--- a/kdump.spec
+++ b/kdump.spec
@@ -47,6 +47,7 @@ Url:            https://github.com/ptesarik/kdump
 Source:         %{name}-%{version}.tar.bz2
 Source2:        %{name}-rpmlintrc
 Patch1:         %{name}-fillupdir-fixes.patch
+Patch2:         %{name}-block-initrd-parse-etc.service.patch
 BuildRequires:  asciidoc
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -105,6 +106,7 @@ after a crash dump has occured.
 %if 0%{?suse_version} >= 1330
 %patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 export CFLAGS="%{optflags}"