From 5d1bd77aed6315fb4c9462c916b213711aafca83 Mon Sep 17 00:00:00 2001
From: Dave Young <dyoung@redhat.com>
Date: Tue, 12 Jun 2012 09:42:39 +0800
Subject: [PATCH] cleanup DUMP_INSTRUCTION handling

let add_dump_code only deal with real dump instruction,
move other logic out of that function, so it's easier for future features
like kdump_pre and kdump_post.

Signed-off-by: Dave Young <dyoung@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
---
 dracut-kdump.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index a46024f..3b60760 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -11,6 +11,8 @@ DUMP_INSTRUCTION=""
 SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa"
 KDUMP_SCRIPT_DIR="/kdumpscripts"
 DD_BLKSIZE=512
+FINAL_ACTION="reboot -f"
+DUMP_RETVAL=0
 
 export PATH=$PATH:$KDUMP_SCRIPT_DIR
 
@@ -30,7 +32,7 @@ do_default_action()
 
 add_dump_code()
 {
-    DUMP_INSTRUCTION="$1 || do_default_action"
+    DUMP_INSTRUCTION=$1
 }
 
 get_mp()
@@ -187,4 +189,10 @@ if [ -z "$DUMP_INSTRUCTION" ]; then
     add_dump_code "dump_rootfs"
 fi
 
-eval "$DUMP_INSTRUCTION; reboot -f"
+$DUMP_INSTRUCTION
+DUMP_RETVAL=$?
+if [ $DUMP_RETVAL -ne 0 ]; then
+    do_default_action
+fi
+
+$FINAL_ACTION