[kexec-tools] blacklist patch apply fix

Dave Young yangrr at fedoraproject.org
Thu Jul 5 09:01:12 UTC 2012


commit ea5c605d1609d32d61d28077b94e48bb5aaaf37e
Author: dyoung at redhat.com <dyoung at redhat.com>
Date:   Tue Jun 26 17:21:52 2012 +0800

    blacklist patch apply fix
    
    The original blacklist patch was applied without conflict.
    But in fact there's exactly same context with amerigo's original patch and
    it's in wrong place!
    
    Moving it to the right switch branch..
    
    Signed-off-by: Dave Young <dyoung at redhat.com>
    Acked-by: Vivek Goyal <vgoyal at redhat.com>

 mkdumprd |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/mkdumprd b/mkdumprd
index 084e1cb..31aa13f 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -50,9 +50,6 @@ check_size() {
         raw)
             avail=$(get_raw_size "$2")
             ;;
-        blacklist)
-            add_dracut_arg "--omit-drivers" "$config_val"
-            ;;
         *)
             return
     esac
@@ -184,6 +181,9 @@ do
     extra_bins)
         add_dracut_arg "-I" "$config_val"
         ;;
+    blacklist)
+        add_dracut_arg "--omit-drivers" "$config_val"
+        ;;
     *)
         if [ -n $(echo $config_opt | grep "^#.*$") ]
         then


More information about the scm-commits mailing list