From 9e964ff4c61201dab56d71a495e0da6acba251ab Mon Sep 17 00:00:00 2001 From: Baoquan He Date: Thu, 30 May 2013 10:07:08 +0800 Subject: [PATCH] kdump.sysconfig: Add option action_on_fail and set its default as continue Upon encountering a failure, dracut can drop user to emergency shell. But in kdump environment kdump module wants to do the error handling and wants to handle error as sepecified by user in kdump.conf file (halt, reboot etc). Now dracut has provided an option action_on_fail=continue which means dracut just ignores the failure and continues and expects module to handle the error. Modify kdump.sysconfig to pass action_on_fail=continue to dracut. Signed-off-by: Vivek Goyal Signed-off-by: Baoquan He Acked-by: WANG Chao Acked-by: Vivek Goyal --- kdump.sysconfig.i386 | 2 +- kdump.sysconfig.ppc64 | 4 +++- kdump.sysconfig.s390x | 2 +- kdump.sysconfig.x86_64 | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kdump.sysconfig.i386 b/kdump.sysconfig.i386 index 309e63f..ac6055d 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" +KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices numa=off udev.children-max=2 action_on_fail=continue" # Any additional kexec arguments required. In most situations, this should # be left empty diff --git a/kdump.sysconfig.ppc64 b/kdump.sysconfig.ppc64 index 17f83fb..76ede23 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" +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" # Any additional kexec arguments required. In most situations, this should # be left empty @@ -33,3 +33,5 @@ KDUMP_IMG="vmlinuz" #What is the images extension. Relocatable kernels don't have one KDUMP_IMG_EXT="" + +#Specify the action after failure diff --git a/kdump.sysconfig.s390x b/kdump.sysconfig.s390x index d7993c4..3a991a2 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" +KDUMP_COMMANDLINE_APPEND="maxcpus=1 cgroup_disable=memory numa=off udev.children-max=2 action_on_fail=continue" # Any additional /sbin/mkdumprd arguments required. MKDUMPRD_ARGS="" diff --git a/kdump.sysconfig.x86_64 b/kdump.sysconfig.x86_64 index c11ce0b..026ad10 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" +KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices cgroup_disable=memory mce=off numa=off udev.children-max=2 action_on_fail=continue" # Any additional kexec arguments required. In most situations, this should # be left empty