[kexec-tools] kdump.conf default default action fix

Dave Young yangrr at fedoraproject.org
Wed Jun 6 08:32:08 UTC 2012


commit 3bab7bf251429e92cca4b2920852c3231440f274
Author: Dave Young <dyoung at redhat.com>
Date:   Wed Jun 6 16:22:42 2012 +0800

    kdump.conf default default action fix
    
    If default action is not set kdump will by default dump to root fs
    Fix kdump.conf[.5] about this issue
    
    Signed-off-by: Dave Young <dyoung at redhat.com>
    Acked-by: Vivek Goyal <vgoyal at redhat.com>

 kdump.conf   |    7 +++----
 kdump.conf.5 |    8 ++------
 2 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/kdump.conf b/kdump.conf
index 308a9a8..2ea205f 100644
--- a/kdump.conf
+++ b/kdump.conf
@@ -53,8 +53,9 @@
 # 			  dependent modules will automatically be included.
 #
 # default <reboot | halt | poweroff | shell>
-#			- Action to preform instead of mounting root fs and
-#			  running init process
+#			- Action to preform in case dumping to intended target
+#			  fails. If no default action is specified saving vmcore
+#			  to root fs is assumed default.
 #			  reboot: If the default action is reboot simply reboot
 #				  the system and loose the core that you are
 #				  trying to retrieve.
@@ -66,8 +67,6 @@
 #				  an msh session inside the initramfs from
 #				  where you can try to record the core manually.
 #				  Exiting this shell reboots the system.
-#			  NOTE: If no default action is specified, the initramfs
-#				will mount the root file system and run init.
 
 #raw /dev/sda5
 #ext4 /dev/sda3
diff --git a/kdump.conf.5 b/kdump.conf.5
index f9ae697..cc34360 100644
--- a/kdump.conf.5
+++ b/kdump.conf.5
@@ -96,17 +96,13 @@ dependent modules will automatically be included.
 
 .B default <reboot | halt | shell> 
 .RS
-Action to preform instead of mounting root fs and running init process
+Action to preform in case dumping to intended target fails. If no default
+action is specified saving vmcore to root fs is assumed default.
 reboot: If the default action is reboot simply reboot the system (this is what
 most people will want, as it returns the system to a nominal state).  shell: If the default
 action is shell, then drop to an msh session inside the initramfs from
 where you can manually preform additional recovery actions.  Exiting this shell
 reboots the system.  halt: bring the system to a halt, requiring manual reset
-NOTE: Since kdump.conf is only used to configure the kdump initramfs
-specifying a default action without also specifying a dump target
-will cause the default directive to be ignored.  A warning  will be issued
-on service start if this invalid configuration is specified.  Also note that if
-no default action is specified, reboot is implied.
 .RE
 
 .SH EXAMPLES


More information about the scm-commits mailing list