[kexec-tools] mkdumprd: don't use consolehelper

[Cong Wang]

commit 75b0166343be1aae963b50d175eaf4681a60f112
Author: Amerigo Wang <amwang at redhat.com>
Date:   Wed Jul 27 19:45:59 2011 +0800

    mkdumprd: don't use consolehelper

 kdump_dracut_modules/99kdumpbase/kdump-lib.sh |    2 +-
 kexec-tools.spec                              |    5 ++++-
 mkdumprd                                      |   16 +++++++++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/kdump_dracut_modules/99kdumpbase/kdump-lib.sh b/kdump_dracut_modules/99kdumpbase/kdump-lib.sh
index 2cd4ce5..4783a24 100755
--- a/kdump_dracut_modules/99kdumpbase/kdump-lib.sh
+++ b/kdump_dracut_modules/99kdumpbase/kdump-lib.sh
@@ -20,7 +20,7 @@ read_kdump_conf()
             default)
                 case $config_val in
                     shell)
-                           DEFAULT_ACTION="/bin/sh"
+                           DEFAULT_ACTION="emergency_shell"
                            ;;
                     reboot)
                             DEFAULT_ACTION="reboot -f"
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 766d745..1eb596f 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -281,6 +281,9 @@ done
 
 
 %changelog
+* Wed Jul 27 2011 Cong Wang <xiyou.wangcong at gmail.com> - 2.0.2-12
+- Don't use consolehelper, use real reboot/halt/poweroff.
+
 * Wed Jul 27 2011 Cong Wang <xiyou.wangcong at gmail.com> - 2.0.2-11
 - Rename initrd to initramfs.
 
diff --git a/mkdumprd b/mkdumprd
index 8c736f4..fbb1aa8 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -10,7 +10,7 @@ export IN_KDUMP=1
 
 conf_file="/etc/kdump.conf"
 extra_modules=""
-dracut_args="-H"
+dracut_args="-H -o i18n -o plymouth"
 
 add_dracut_arg() {
     dracut_args="$dracut_args $*"
@@ -70,6 +70,20 @@ if [ -n "$conf_file" ]; then
         extra_bins)
             add_dracut_arg "-I $config_val"
             ;;
+        default)
+            case $config_val in
+                reboot)
+                    add_dracut_arg "-I reboot"
+                    ;;
+                halt)
+                    add_dracut_arg "-I halt"
+                    ;;
+                poweroff)
+                    add_dracut_arg "-I poweroff"
+                    ;;
+            esac
+            ;;
+
         *)
             if [ -n $(echo $config_opt | grep "^#.*$") ]
             then