From 52dbdacb5fce04de3e827146c0d16658787ad66d Mon Sep 17 00:00:00 2001
From: Amerigo Wang <amwang@redhat.com>
Date: Wed, 27 Jul 2011 20:37:49 +0800
Subject: [PATCH] wait for loginit

---
 kdump_dracut_modules/99kdumpbase/kdump-lib.sh | 11 +++++++----
 kexec-tools.spec                              |  5 ++++-
 mkdumprd                                      | 14 --------------
 sources                                       |  1 +
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/kdump_dracut_modules/99kdumpbase/kdump-lib.sh b/kdump_dracut_modules/99kdumpbase/kdump-lib.sh
index 52175c4..298f2b5 100755
--- a/kdump_dracut_modules/99kdumpbase/kdump-lib.sh
+++ b/kdump_dracut_modules/99kdumpbase/kdump-lib.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. /lib/dracut-lib.sh
+
 KDUMP_PATH="/var/crash"
 CORE_COLLECTOR="makedumpfile -d 31 -c"
 DEFAULT_ACTION="reboot -f"
@@ -20,16 +22,16 @@ read_kdump_conf()
             default)
                 case $config_val in
                     shell)
-                           DEFAULT_ACTION="emergency_shell"
+                           DEFAULT_ACTION="sh -i -l"
                            ;;
                     reboot)
-                            DEFAULT_ACTION="/usr/bin/reboot -f"
+                            DEFAULT_ACTION="reboot -f"
                             ;;
                     halt)
-                            DEFAULT_ACTION="/usr/bin/halt -f"
+                            DEFAULT_ACTION="halt -f"
                             ;;
                     poweroff)
-                            DEFAULT_ACTION="/usr/bin/poweroff -f"
+                            DEFAULT_ACTION="poweroff -f"
                             ;;
                 esac
 	        ;;
@@ -40,6 +42,7 @@ read_kdump_conf()
 
 do_default_action()
 {
+    wait_for_loginit
     $DEFAULT_ACTION
 }
 
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 074e630..170331a 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.2
-Release: 13%{?dist}
+Release: 14%{?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@gmail.com> - 2.0.2-14
+- Wait for loginit.
+
 * Wed Jul 27 2011 Cong Wang <xiyou.wangcong@gmail.com> - 2.0.2-13
 - Use absolute path of reboot/halt/poweroff.
 
diff --git a/mkdumprd b/mkdumprd
index fbb1aa8..6ba9d9f 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -70,20 +70,6 @@ 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
diff --git a/sources b/sources
index 14bf474..c3ca426 100644
--- a/sources
+++ b/sources
@@ -7,3 +7,4 @@ d872bdde29eb036cd59e7b71c148fca6  dracut-files.tbz2
 729603e26a37b91aafd52966300693f8  dracut-files.tbz2
 1c866f72a724807d4dc23fa8571b8e08  dracut-files.tbz2
 7d1516ae8af7000cec149b9409f9b859  dracut-files.tbz2
+ea7a345cbaa0d3d9a9dbd46631155550  dracut-files.tbz2