[kexec-tools] install core_collector in module-setup.sh

Dave Young yangrr at fedoraproject.org
Thu Jul 12 03:21:44 UTC 2012


commit 4d37a55bc1d24a459612530063c69ef74676540d
Author: Dave Young <dyoung at redhat.com>
Date:   Thu Jul 12 11:15:35 2012 +0800

    install core_collector in module-setup.sh
    
    file install code should stay in module-setup.sh, move core_collector installation
    code as well.
    
    Note: mkdumpfile is installed twice before, one is dracut cmdline, another is
    module_setup.sh. This patch removed the duplicate code in dracut cmdline.
    
    Signed-off-by: Dave Young <dyoung at redhat.com>
    Acked-by: Vivek Goyal <vgoyal at redhat.com>

 dracut-module-setup.sh |    3 +++
 mkdumprd               |    3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index a75381c..8ef9c36 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -201,6 +201,9 @@ kdump_install_conf() {
         kdump_pre|kdump_post|extra_bins)
             dracut_install $config_val
             ;;
+        core_collector)
+            dracut_install "${config_val%% *}"
+            ;;
         esac
     done < /etc/kdump.conf
 
diff --git a/mkdumprd b/mkdumprd
index b4e9b84..3b9bd71 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -13,7 +13,7 @@ SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa"
 SAVE_PATH=$(grep ^path $conf_file| cut -d' '  -f2)
 [ -z "$SAVE_PATH" ] && SAVE_PATH="/var/crash"
 extra_modules=""
-dracut_args=("--hostonly" "--add" "kdumpbase" "--add" "kernel-modules" "-c" "/dev/null" "-I" "/sbin/makedumpfile" "-o" "plymouth dash")
+dracut_args=("--hostonly" "--add" "kdumpbase" "--add" "kernel-modules" "-c" "/dev/null" "-o" "plymouth dash")
 
 add_dracut_arg() {
     while [ $# -gt 0 ];
@@ -217,7 +217,6 @@ do
         ;;
     core_collector)
         verify_core_collector "$config_val"
-        add_dracut_arg "-I" "${config_val%% *}"
         ;;
     blacklist)
         add_dracut_arg "--omit-drivers" "$config_val"


More information about the scm-commits mailing list