[kexec-tools] Fix add_dracut_arg in mkdumprd

Cong Wang wangcong at fedoraproject.org
Tue Jan 10 14:35:02 UTC 2012


commit a0f1142b60ffed28b35aa1d3af7225e5dd4df23b
Author: Cong Wang <xiyou.wangcong at gmail.com>
Date:   Tue Jan 10 22:34:47 2012 +0800

    Fix add_dracut_arg in mkdumprd

 kexec-tools.spec |    5 ++++-
 mkdumprd         |    8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/kexec-tools.spec b/kexec-tools.spec
index edbc570..31c1798 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.2
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -297,6 +297,9 @@ done
 
 
 %changelog
+* Tue Jan 10 2012 Cong Wang <xiyou.wangcong at gmail.com> - 2.0.2-32
+- Fix add_dracut_arg in mkdumprd.
+
 * Tue Jan 10 2012 Cong Wang <xiyou.wangcong at gmail.com> - 2.0.2-31
 - Update kdump dracut module with the latest dracut kdump branch.
 
diff --git a/mkdumprd b/mkdumprd
index d09d3ff..d621f00 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -10,7 +10,7 @@ export IN_KDUMP=1
 
 conf_file="/etc/kdump.conf"
 extra_modules=""
-dracut_args=("-m" "kdumpbase" "--add" "dash" "--add" "fstab-sys" "-c" "/dev/null")
+dracut_args=("-m" "kdumpbase" "--add" "dash" "--add" "fstab-sys" "-c" "/dev/null" "-I" "/sbin/makedumpfile")
 
 add_dracut_arg() {
     while [ $# -gt 0 ];
@@ -99,10 +99,10 @@ if [ -n "$conf_file" ]; then
             fi
             ;;
         core_collector)
-            add_dracut_arg "-I ${config_val% *}"
+            add_dracut_arg "-I" "${config_val% *}"
             ;;
         extra_bins)
-            add_dracut_arg "-I $config_val"
+            add_dracut_arg "-I" "$config_val"
             ;;
         *)
             if [ -n $(echo $config_opt | grep "^#.*$") ]
@@ -116,7 +116,7 @@ fi
 
 if [ -n "$extra_modules" ]
 then
-    add_dracut_arg "--add-drivers $extra_modules"
+    add_dracut_arg "--add-drivers" "$extra_modules"
 fi
 
 dracut "${dracut_args[@]}" -M "$@"


More information about the scm-commits mailing list