rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Deprecate blacklist option

Browse Source 
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@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
Dave Young 2013-03-22 11:55:24 +08:00 committed by Baoquan He
parent 4f1111a667
commit dc8e283ff5
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kdump.conf
View File

@ -22,10 +22,6 @@
# <user@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@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

22
kdump.conf.5
View File

@ -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)

4
kdumpctl
View File

@ -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
;;

3
mkdumprd
View File

@ -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