[kexec-tools] Deprecate blacklist option

[Baoquan He]

commit dc8e283ff589bcd002ff8de2c14990cc076d3ca9
Author: Dave Young <dave at redhat.com>
Date:   Fri Mar 22 11:55:24 2013 +0800

    Deprecate blacklist option
    
    Current blacklist option is different from the option in rhel6. In current
    implementation blacklist just means omit the driver, but it should really
    be preventing it being loaded in initramfs.
    
    To keep consistent, just make the option as deprecated. User is suggested
    to user dracut kernel cmdline rd.driver.blacklist instead.
    
    [v1->v2]: improve man page description, thanks Vivek.
    
    Tested in kvm guest with rd.driver.blacklist in kdump sysconfig
    
    Signed-off-by: Dave Young <dyoung at redhat.com>
    Acked-by: Vivek Goyal <vgoyal at redhat.com>

 kdump.conf   |    5 -----
 kdump.conf.5 |   22 +++++++++++++++-------
 kdumpctl     |    4 ++--
 mkdumprd     |    3 ---
 4 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/kdump.conf b/kdump.conf
index fbed498..afa2af8 100644
--- a/kdump.conf
+++ b/kdump.conf
@@ -22,10 +22,6 @@
 #			  <user at server>:/var/crash/%HOST-%DATE/, supports DNS
 #			  NOTE: make sure user has necessary write
 #			  permissions on server
-# blacklist <list of kernel modules>	- Specify a space-separated list of
-# 			  kernel modules not to add to the initramfs.
-#			  The kernel modules have to be specified without the
-#			  ".ko" suffix.
 #
 # sshkey <path>		- Will use the sshkey to do ssh dump
 #			  Specifies the path of the ssh key you want to use
@@ -125,7 +121,6 @@
 #nfs my.server.com:/export/tmp
 #ssh user at my.server.com
 #sshkey /root/.ssh/kdump_id_rsa
-#blacklist cfg80211
 path /var/crash
 #core_collector makedumpfile -c --message-level 1 -d 31
 #core_collector scp
diff --git a/kdump.conf.5 b/kdump.conf.5
index 66b5e01..31761f8 100644
--- a/kdump.conf.5
+++ b/kdump.conf.5
@@ -46,12 +46,6 @@ supports DNS. NOTE: make sure user has necessary write permissions on
 server and that a fqdn is used as the server name
 .RE
 
-.B blacklist <list of kernel modules>
-.RS
-Specify a space-separated list of kernel modules not to add to the initramfs.
-The kernel modules have to be specified without the ".ko" suffix.
-.RE
-
 .B sshkey <path>
 .RS
 Specifies the path of the ssh key you want to use when do ssh dump,
@@ -214,6 +208,20 @@ Higher level means more debugging output.
 3 - /proc/meminfo + /proc/slabinfo
 .RE
 
+.B blacklist <list of kernel modules>
+.RS
+blacklist option was recently being used to prevent loading modules in
+initramfs. General terminology for blacklist has been that module is
+present in initramfs but it is not actually loaded in kernel. Hence
+retaining blacklist option creates more confusing behavior. It has been
+deprecated.
+.PP
+Instead use rd.driver.blacklist option on second kernel to blacklist
+a certain module. One can edit /etc/sysconfig/kdump.conf and edit
+KDUMP_COMMANDLINE_APPEND to pass kernel command line options. Refer
+to dracut.cmdline man page for more details on module blacklist option.
+.RE
+
 .RE
 
 .SH EXAMPLES
@@ -291,4 +299,4 @@ examples for other options please see
 
 .SH SEE ALSO
 
-kexec(8) mkdumprd(8)
+kexec(8) mkdumprd(8) dracut.cmdline(7)
diff --git a/kdumpctl b/kdumpctl
index fd73474..9b102e5 100755
--- a/kdumpctl
+++ b/kdumpctl
@@ -86,13 +86,13 @@ function check_config()
 		case "$config_opt" in
 		\#* | "")
 			;;
-		raw|ext2|ext3|ext4|minix|btrfs|xfs|nfs|ssh|sshkey|blacklist|path|core_collector|kdump_post|kdump_pre|extra_bins|extra_modules|default|force_rebuild)
+		raw|ext2|ext3|ext4|minix|btrfs|xfs|nfs|ssh|sshkey|path|core_collector|kdump_post|kdump_pre|extra_bins|extra_modules|default|force_rebuild)
 			[ -z "$config_val" ] && {
 				echo "Invalid kdump config value for option $config_opt."
 				return 1;
 			}
 			;;
-		net|options|link_delay|disk_timeout|debug_mem_level)
+		net|options|link_delay|disk_timeout|debug_mem_level|blacklist)
 			echo "Deprecated kdump config option: $config_opt. Refer to kdump.conf manpage for alternatives."
 			return 1
 			;;
diff --git a/mkdumprd b/mkdumprd
index dcdf0e9..21ed384 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -271,9 +271,6 @@ do
     core_collector)
         verify_core_collector "$config_val"
         ;;
-    blacklist)
-        add_dracut_arg "--omit-drivers" "$config_val"
-        ;;
     *)
         if [ -n $(echo $config_opt | grep "^#.*$") ]
         then