[kexec-tools] Add tab key as delimiter for core_collector in kdump.conf

Baoquan He baoquan at fedoraproject.org
Tue Jun 4 06:12:43 UTC 2013


commit 259baae8f3c340d80fe3cd0f458faa777ae08a53
Author: Baoquan He <bhe at redhat.com>
Date:   Tue May 28 17:53:59 2013 +0800

    Add tab key as delimiter for core_collector in kdump.conf
    
    In kdump.conf, space key is used as delimiter by default.
    
    In kdump_install_conf of dracut-module-setup.sh, if specify
    core_collector with a tab delimiter, the tool may not be
    copied into kdump-initrd.
    E.g, core_collector scp		-v
    
    And in dump_ssh of dracut-kdump.sh, dumping will fail caused
    by tab key in core_collector.
    
    Here change code to allow tab key as delimiter when specifying
    core_collector.
    
    Signed-off-by: Baoquan He <bhe at redhat.com>
    Acked-by: Vivek Goyal <vgoyal at redhat.com>

 dracut-kdump.sh        |    2 +-
 dracut-module-setup.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index b7deb1f..29ef4a4 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -112,7 +112,7 @@ dump_ssh()
 
     save_vmcore_dmesg_ssh ${DMESG_COLLECTOR} ${_dir} "${_opt}" $2
 
-    if [ "${CORE_COLLECTOR%% *}" = "scp" ]; then
+    if [ "${CORE_COLLECTOR%%[[:blank:]]*}" = "scp" ]; then
         scp -q $_opt /proc/vmcore "$2:$_dir/vmcore-incomplete" || return 1
         ssh $_opt $2 "mv $_dir/vmcore-incomplete $_dir/vmcore" || return 1
     else
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 201fc8b..fd178b1 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -251,7 +251,7 @@ kdump_install_conf() {
             dracut_install $config_val
             ;;
         core_collector)
-            dracut_install "${config_val%% *}"
+            dracut_install "${config_val%%[[:blank:]]*}"
             ;;
         esac
     done < /etc/kdump.conf


More information about the scm-commits mailing list