baoquan pushed to kexec-tools (master). "Revert "execute kdump_post after do_default_action" (..more)"

[notifications at fedoraproject.org]

>From 6f4940f1985521bc89a3321ed170b9c5e23913a2 Mon Sep 17 00:00:00 2001
From: Baoquan He <bhe at redhat.com>
Date: Wed, 8 Apr 2015 15:50:16 +0800
Subject: Revert "execute kdump_post after do_default_action"

This reverts commit f4c45236bfd9649f6a8abf261c883b059506f138.
Since that commit will change the behaviour of kdump_post. That is not
good.

Signed-off-by: Baoquan He <bhe at redhat.com>

diff --git a/dracut-kdump-error-handler.sh b/dracut-kdump-error-handler.sh
index e0c6724..2f0f1d1 100755
--- a/dracut-kdump-error-handler.sh
+++ b/dracut-kdump-error-handler.sh
@@ -6,6 +6,5 @@ set -o pipefail
 export PATH=$PATH:$KDUMP_SCRIPT_DIR
 
 get_kdump_confs
-do_kdump_post 1
 do_default_action
 do_final_action
diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index fa8908f..e062665 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -35,6 +35,13 @@ do_kdump_pre()
     fi
 }
 
+do_kdump_post()
+{
+    if [ -n "$KDUMP_POST" ]; then
+        "$KDUMP_POST" "$1"
+    fi
+}
+
 add_dump_code()
 {
     DUMP_INSTRUCTION=$1
diff --git a/kdump-lib-initramfs.sh b/kdump-lib-initramfs.sh
index d91816f..68a94e8 100755
--- a/kdump-lib-initramfs.sh
+++ b/kdump-lib-initramfs.sh
@@ -161,10 +161,3 @@ do_final_action()
 {
     eval $FINAL_ACTION
 }
-
-do_kdump_post()
-{
-    if [ -n "$KDUMP_POST" ]; then
-        "$KDUMP_POST" "$1"
-    fi
-}
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kexec-tools.git/commit/?h=master&id=6f4940f1985521bc89a3321ed170b9c5e23913a2