rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

kdumpctl: change prepare_cmdline() to operate KDUMP_COMMANDLINE directly

Browse Source 
Since KDUMP_COMMANDLINE is a global variable, prepare_cmdline can
modify it directly instead of echoing back the result. This change
enables it to output messages.

Changed some coding styles.

Signed-off-by: Xunlei Pang <xlpang@redhat.com>
Acked-by: Dave Young <dyoung@redhat.com>
Acked-by: Pratyush Anand <panand@redhat.com>
This commit is contained in:
Xunlei Pang 2017-01-12 12:47:20 +08:00 committed by Dave Young
parent 8f07591ff1
commit 211b36b8f9
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kdumpctl
View File

@ -105,10 +105,12 @@ append_cmdline()
echo $cmdline echo $cmdline
} }
# This function performs a series of edits on the command line # This function performs a series of edits on the command line.
# Store the final result in global $KDUMP_COMMANDLINE.
prepare_cmdline() prepare_cmdline()
{ {
local cmdline; local cmdline id
if [ -z "$KDUMP_COMMANDLINE" ]; then if [ -z "$KDUMP_COMMANDLINE" ]; then
cmdline=`cat /proc/cmdline` cmdline=`cat /proc/cmdline`
# 'root' parameter will cause kdump failure in live images # 'root' parameter will cause kdump failure in live images
@ -118,6 +120,7 @@ prepare_cmdline()
else else
cmdline=${KDUMP_COMMANDLINE} cmdline=${KDUMP_COMMANDLINE}
fi fi
# These params should always be removed # These params should always be removed
cmdline=`remove_cmdline_param "$cmdline" crashkernel panic_on_warn` cmdline=`remove_cmdline_param "$cmdline" crashkernel panic_on_warn`
# These params can be removed configurably # These params can be removed configurably
@ -125,12 +128,12 @@ prepare_cmdline()
cmdline="${cmdline} ${KDUMP_COMMANDLINE_APPEND}" cmdline="${cmdline} ${KDUMP_COMMANDLINE_APPEND}"
local id=`get_bootcpu_initial_apicid` id=`get_bootcpu_initial_apicid`
if [ ! -z ${id} ] ; then if [ ! -z ${id} ] ; then
cmdline=`append_cmdline "${cmdline}" disable_cpu_apicid ${id}` cmdline=`append_cmdline "${cmdline}" disable_cpu_apicid ${id}`
fi fi
echo $cmdline KDUMP_COMMANDLINE=$cmdline
} }
@ -642,7 +645,7 @@ load_kdump()
fi fi
fi fi
KDUMP_COMMANDLINE=`prepare_cmdline` prepare_cmdline
# For secureboot enabled machines, use new kexec file based syscall. # For secureboot enabled machines, use new kexec file based syscall.
# Old syscall will always fail as it does not have capability to # Old syscall will always fail as it does not have capability to