diff --git a/SOURCES/kdumpctl b/SOURCES/kdumpctl index 4e09ac8..3e273b1 100755 --- a/SOURCES/kdumpctl +++ b/SOURCES/kdumpctl @@ -134,6 +134,11 @@ prepare_cmdline() # KDUMP_COMMANDLINE_APPEND. cmdline=$(remove_cmdline_param "$cmdline" root) + # Remove netroot, rd.iscsi.initiator and iscsi_initiator since + # we get duplicate entries for the same in case iscsi code adds + # it as well. + cmdline=$(remove_cmdline_param "$cmdline" netroot rd.iscsi.initiator iscsi_initiator) + cmdline="${cmdline} ${KDUMP_COMMANDLINE_APPEND}" id=$(get_bootcpu_apicid) diff --git a/SPECS/kexec-tools.spec b/SPECS/kexec-tools.spec index eec83c7..260d4d3 100644 --- a/SPECS/kexec-tools.spec +++ b/SPECS/kexec-tools.spec @@ -1,6 +1,6 @@ Name: kexec-tools Version: 2.0.15 -Release: 13%{?dist}.1 +Release: 13%{?dist}.2 License: GPLv2 Group: Applications/System Summary: The kexec/kdump userspace component. @@ -392,6 +392,9 @@ done %doc %changelog +* Thu Aug 16 2018 Pingfan Liu 2.0.15-13.2 +- kdumpctl: Remove 'netroot' and 'iscsi initiator' entries from kdump cmdline + * Tue Jun 26 2018 Pingfan Liu 2.0.15-13.1 - makedumpfile: fix for hugepages filtering