[kexec-tools] kdump, remove panic_on_warn from 2nd kernel cmdline

WANG Chao wangchao at fedoraproject.org
Wed Dec 17 07:58:21 UTC 2014


commit 7d8be97b64548ec04059940713febb3dcf4b714b
Author: Prarit Bhargava <prarit at redhat.com>
Date:   Mon Nov 17 11:13:50 2014 -0500

    kdump, remove panic_on_warn from 2nd kernel cmdline
    
    With the inclusion of 'panic_on_warn',
    
         http://marc.info/?l=linux-api&m=141570937328528&w=2
    
    and which is now staged in Andrew Morton's tree, we need to remove
    'panic_on_warn' from the 2nd kernel's cmdline.  If it is included it is
    possible a non-fatal warning could panic the second kernel.
    
    Before:
    
    [    0.000000] Kernel command line: BOOT_IMAGE=/vmlinuz-3.10.0+
    root=/dev/mapper/rhel_intel--canoepass--05-root ro
    rd.lvm.lv=rhel_intel-canoepass-05/root
    rd.lvm.lv=rhel_intel-canoepass-05/swap console=ttyS0,115200n81
    LANG=en_US.UTF-8 systemd.debug panic_on_warn=1 irqpoll nr_cpus=1
    reset_devices cgroup_disable=memory mce=off numa=off udev.children-max=2
    panic=10 rootflags=nofail acpi_no_memhotplug disable_cpu_apicid=0
    elfcorehdr=839092K
    
    After:
    
    [    0.000000] Kernel command line: BOOT_IMAGE=/vmlinuz-3.10.0+
    root=/dev/mapper/rhel_intel--canoepass--05-root ro
    rd.lvm.lv=rhel_intel-canoepass-05/root
    rd.lvm.lv=rhel_intel-canoepass-05/swap console=ttyS0,115200n81
    LANG=en_US.UTF-8 systemd.debug irqpoll nr_cpus=1 reset_devices
    cgroup_disable=memory mce=off numa=off udev.children-max=2 panic=10
    rootflags=nofail acpi_no_memhotplug disable_cpu_apicid=0
    elfcorehdr=839092K
    
    Signed-off-by: Prarit Bhargava <prarit at redhat.com>
    Acked-by: Vivek Goyal <vgoyal at redhat.com>

 kdumpctl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/kdumpctl b/kdumpctl
index ee3214a..a9e5d2e 100755
--- a/kdumpctl
+++ b/kdumpctl
@@ -105,7 +105,7 @@ prepare_cmdline()
 	else
 		cmdline=${KDUMP_COMMANDLINE}
 	fi
-	cmdline=`remove_cmdline_param "$cmdline" crashkernel hugepages hugepagesz`
+	cmdline=`remove_cmdline_param "$cmdline" crashkernel hugepages hugepagesz panic_on_warn`
 
 
 	cmdline="${cmdline} ${KDUMP_COMMANDLINE_APPEND}"


More information about the scm-commits mailing list