From 224b700c8293d2cd1338d1d6edc037ed051c88ee Mon Sep 17 00:00:00 2001 From: root Date: Thu, 6 Jun 2013 11:18:31 +0800 Subject: [PATCH] kdump.sysconfig: append "panic=10" to kdump cmdline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When doing kdump If the capture kernel crashes for some reason, the default behavior appears to be hanging the system without rebooting. We at least need an option to reset if the capture kernel crashes. Business critical customers tend to want the system to reboot without manual intervention. Kernel provides a parameter “panic=n” to solve such problem. If this parameter is given, the capture kernel will reboot after n seconds in case it panics. Now add this parameter into “KDUMP_COMMANDLINE_APPEND”, and set the default waiting time value as 10 seconds. It's tested on KVM f19, and passed. Signed-off-by: Baoquan He Acked-by: Vivek Goyal --- kdump.sysconfig.i386 | 2 +- kdump.sysconfig.ppc64 | 2 +- kdump.sysconfig.s390x | 2 +- kdump.sysconfig.x86_64 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kdump.sysconfig.i386 b/kdump.sysconfig.i386 index ac6055d..cca9ec5 100644 --- a/kdump.sysconfig.i386 +++ b/kdump.sysconfig.i386 @@ -16,7 +16,7 @@ KDUMP_COMMANDLINE="" # This variable lets us append arguments to the current kdump commandline # As taken from either KDUMP_COMMANDLINE above, or from /proc/cmdline -KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices numa=off udev.children-max=2 action_on_fail=continue" +KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices numa=off udev.children-max=2 action_on_fail=continue panic=10" # Any additional kexec arguments required. In most situations, this should # be left empty diff --git a/kdump.sysconfig.ppc64 b/kdump.sysconfig.ppc64 index 76ede23..69ff2de 100644 --- a/kdump.sysconfig.ppc64 +++ b/kdump.sysconfig.ppc64 @@ -16,7 +16,7 @@ KDUMP_COMMANDLINE="" # This variable lets us append arguments to the current kdump commandline # As taken from either KDUMP_COMMANDLINE above, or from /proc/cmdline -KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1 noirqdistrib reset_devices cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 action_on_fail=continue" +KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1 noirqdistrib reset_devices cgroup_disable=memory numa=off udev.children-max=2 ehea.use_mcs=0 action_on_fail=continue panic=10" # Any additional kexec arguments required. In most situations, this should # be left empty diff --git a/kdump.sysconfig.s390x b/kdump.sysconfig.s390x index 3a991a2..3972b29 100644 --- a/kdump.sysconfig.s390x +++ b/kdump.sysconfig.s390x @@ -16,7 +16,7 @@ KDUMP_COMMANDLINE="" # This variable lets us append arguments to the current kdump commandline # As taken from either KDUMP_COMMANDLINE above, or from /proc/cmdline -KDUMP_COMMANDLINE_APPEND="maxcpus=1 cgroup_disable=memory numa=off udev.children-max=2 action_on_fail=continue" +KDUMP_COMMANDLINE_APPEND="maxcpus=1 cgroup_disable=memory numa=off udev.children-max=2 action_on_fail=continue panic=10" # Any additional /sbin/mkdumprd arguments required. MKDUMPRD_ARGS="" diff --git a/kdump.sysconfig.x86_64 b/kdump.sysconfig.x86_64 index 026ad10..dac8edb 100644 --- a/kdump.sysconfig.x86_64 +++ b/kdump.sysconfig.x86_64 @@ -16,7 +16,7 @@ KDUMP_COMMANDLINE="" # This variable lets us append arguments to the current kdump commandline # As taken from either KDUMP_COMMANDLINE above, or from /proc/cmdline -KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices cgroup_disable=memory mce=off numa=off udev.children-max=2 action_on_fail=continue" +KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices cgroup_disable=memory mce=off numa=off udev.children-max=2 action_on_fail=continue panic=10" # Any additional kexec arguments required. In most situations, this should # be left empty