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

cleanup: Remove "function" keyword from all functions and correct typos

Browse Source 
This cleanup patch removes unnecessary keyword "function" at all places in
kdumpctl script. Also, corrects couple of typos in the script.

Signed-off-by: Hari Bathini <hbathini@linux.vnet.ibm.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
Hari Bathini 2014-07-15 12:11:54 +05:30 committed by WANG Chao
parent 61fcf06f98
commit 69986be99d
1 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
kdumpctl
View File

@ -37,7 +37,7 @@ single_instance_lock()
# remove_cmdline_param <kernel cmdline> <param1> [<param2>] ... [<paramN>] # remove_cmdline_param <kernel cmdline> <param1> [<param2>] ... [<paramN>]
# Remove a list of kernel parameters from a given kernel cmdline and print the result. # Remove a list of kernel parameters from a given kernel cmdline and print the result.
# For each "arg" in the removing params list, "arg" and "arg=xxx" will be removed if exists. # For each "arg" in the removing params list, "arg" and "arg=xxx" will be removed if exists.
function remove_cmdline_param() remove_cmdline_param()
{ {
local cmdline=$1 local cmdline=$1
shift shift
@ -55,7 +55,7 @@ function remove_cmdline_param()
# This function returns the "initial apicid" of the # This function returns the "initial apicid" of the
# boot cpu (cpu 0) if present. # boot cpu (cpu 0) if present.
# #
function get_bootcpu_initial_apicid() get_bootcpu_initial_apicid()
{ {
awk ' \ awk ' \
BEGIN { CPU = "-1"; } \ BEGIN { CPU = "-1"; } \
@ -68,7 +68,7 @@ function get_bootcpu_initial_apicid()
# #
# This function appends argument "$2=$3" to string ($1) if not already present. # This function appends argument "$2=$3" to string ($1) if not already present.
# #
function append_cmdline() append_cmdline()
{ {
local cmdline=$1 local cmdline=$1
local newstr=${cmdline/$2/""} local newstr=${cmdline/$2/""}
@ -82,7 +82,7 @@ function append_cmdline()
} }
# This function performs a series of edits on the command line # This function performs a series of edits on the command line
function prepare_cmdline() prepare_cmdline()
{ {
local cmdline; local cmdline;
if [ -z "$KDUMP_COMMANDLINE" ]; then if [ -z "$KDUMP_COMMANDLINE" ]; then
@ -104,7 +104,7 @@ function prepare_cmdline()
} }
function save_core() save_core()
{ {
coredir="/var/crash/`date +"%Y-%m-%d-%H:%M"`" coredir="/var/crash/`date +"%Y-%m-%d-%H:%M"`"
@ -129,7 +129,7 @@ function save_core()
fi fi
} }
function rebuild_initrd() rebuild_initrd()
{ {
$MKDUMPRD $kdump_initrd $kdump_kver $MKDUMPRD $kdump_initrd $kdump_kver
if [ $? != 0 ]; then if [ $? != 0 ]; then
@ -139,7 +139,7 @@ function rebuild_initrd()
} }
#$1: the files to be checked with IFS=' ' #$1: the files to be checked with IFS=' '
function check_exist() check_exist()
{ {
for file in $1; do for file in $1; do
if [ ! -f "$file" ]; then if [ ! -f "$file" ]; then
@ -150,7 +150,7 @@ function check_exist()
} }
#$1: the files to be checked with IFS=' ' #$1: the files to be checked with IFS=' '
function check_executable() check_executable()
{ {
for file in $1; do for file in $1; do
if [ ! -x "$file" ]; then if [ ! -x "$file" ]; then
@ -160,7 +160,7 @@ function check_executable()
done done
} }
function check_config() check_config()
{ {
local nr local nr
@ -226,7 +226,7 @@ get_pcs_cluster_modified_files()
echo $modified_files echo $modified_files
} }
function check_rebuild() check_rebuild()
{ {
local extra_modules modified_files="" local extra_modules modified_files=""
local _force_rebuild force_rebuild="0" local _force_rebuild force_rebuild="0"
@ -286,7 +286,7 @@ function check_rebuild()
elif [ "$force_rebuild" != "0" ]; then elif [ "$force_rebuild" != "0" ]; then
echo -n "Force rebuild $kdump_initrd"; echo echo -n "Force rebuild $kdump_initrd"; echo
elif [ -n "$modified_files" ]; then elif [ -n "$modified_files" ]; then
echo "Detected change(s) the following file(s):" echo "Detected change(s) in the following file(s):"
echo -n " "; echo "$modified_files" | sed 's/\s/\n /g' echo -n " "; echo "$modified_files" | sed 's/\s/\n /g'
else else
return 0 return 0
@ -299,7 +299,7 @@ function check_rebuild()
# This function check iomem and determines if we have more than # This function check iomem and determines if we have more than
# 4GB of ram available. Returns 1 if we do, 0 if we dont # 4GB of ram available. Returns 1 if we do, 0 if we dont
function need_64bit_headers() need_64bit_headers()
{ {
return `tail -n 1 /proc/iomem | awk '{ split ($1, r, "-"); \ return `tail -n 1 /proc/iomem | awk '{ split ($1, r, "-"); \
print (strtonum("0x" r[2]) > strtonum("0xffffffff")); }'` print (strtonum("0x" r[2]) > strtonum("0xffffffff")); }'`
@ -308,7 +308,7 @@ function need_64bit_headers()
# Load the kdump kerel specified in /etc/sysconfig/kdump # Load the kdump kerel specified in /etc/sysconfig/kdump
# If none is specified, try to load a kdump kernel with the same version # If none is specified, try to load a kdump kernel with the same version
# as the currently running kernel. # as the currently running kernel.
function load_kdump() load_kdump()
{ {
MEM_RESERVED=$(cat /sys/kernel/kexec_crash_size) MEM_RESERVED=$(cat /sys/kernel/kexec_crash_size)
if [ $MEM_RESERVED -eq 0 ] if [ $MEM_RESERVED -eq 0 ]
@ -355,7 +355,7 @@ function load_kdump()
fi fi
} }
function check_ssh_config() check_ssh_config()
{ {
while read config_opt config_val; do while read config_opt config_val; do
# remove inline comments after the end of a directive. # remove inline comments after the end of a directive.
@ -388,7 +388,7 @@ function check_ssh_config()
return 0 return 0
} }
function check_ssh_target() check_ssh_target()
{ {
local _ret local _ret
ssh -q -i $SSH_KEY_LOCATION -o BatchMode=yes $DUMP_TARGET mkdir -p $SAVE_PATH ssh -q -i $SSH_KEY_LOCATION -o BatchMode=yes $DUMP_TARGET mkdir -p $SAVE_PATH
@ -400,7 +400,7 @@ function check_ssh_target()
return 0 return 0
} }
function propagate_ssh_key() propagate_ssh_key()
{ {
check_ssh_config check_ssh_config
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -434,10 +434,9 @@ function propagate_ssh_key()
echo $errmsg, $KEYFILE failed in transfer to $SSH_SERVER >&2 echo $errmsg, $KEYFILE failed in transfer to $SSH_SERVER >&2
exit 1 exit 1
fi fi
} }
function check_current_kdump_status() check_current_kdump_status()
{ {
rc=`cat /sys/kernel/kexec_crash_loaded` rc=`cat /sys/kernel/kexec_crash_loaded`
if [ $rc == 1 ]; then if [ $rc == 1 ]; then
@ -447,7 +446,7 @@ function check_current_kdump_status()
fi fi
} }
function save_raw() save_raw()
{ {
local kdump_dir local kdump_dir
local raw_target local raw_target
@ -482,7 +481,8 @@ function save_raw()
return 0 return 0
} }
get_save_path() { get_save_path()
{
local _save_path=$(grep "^path" /etc/kdump.conf|awk '{print $2}') local _save_path=$(grep "^path" /etc/kdump.conf|awk '{print $2}')
if [ -z "$_save_path" ]; then if [ -z "$_save_path" ]; then
_save_path="/var/crash" _save_path="/var/crash"
@ -491,7 +491,8 @@ get_save_path() {
echo $_save_path echo $_save_path
} }
is_dump_target_configured() { is_dump_target_configured()
{
local _target local _target
_target=$(egrep "^ext[234]|^xfs|^btrfs|^minix|^raw|^ssh|^nfs" /etc/kdump.conf) _target=$(egrep "^ext[234]|^xfs|^btrfs|^minix|^raw|^ssh|^nfs" /etc/kdump.conf)
@ -509,7 +510,8 @@ local_fs_dump_target()
fi fi
} }
path_to_be_relabeled() { path_to_be_relabeled()
{
local _path _target _mnt="/" _rmnt local _path _target _mnt="/" _rmnt
if is_dump_target_configured; then if is_dump_target_configured; then
@ -558,7 +560,7 @@ selinux_relabel()
# is 1 and SetupMode is 0, then secure boot is being enforced. # is 1 and SetupMode is 0, then secure boot is being enforced.
# #
# Assume efivars is mounted at /sys/firmware/efi/efivars. # Assume efivars is mounted at /sys/firmware/efi/efivars.
function is_secure_boot_enforced() is_secure_boot_enforced()
{ {
local secure_boot_file setup_mode_file local secure_boot_file setup_mode_file
local secure_boot_byte setup_mode_byte local secure_boot_byte setup_mode_byte
@ -578,7 +580,7 @@ function is_secure_boot_enforced()
return 1 return 1
} }
function check_kdump_feasibility() check_kdump_feasibility()
{ {
if is_secure_boot_enforced; then if is_secure_boot_enforced; then
echo "Secure Boot is Enabled. Kdump service can't be started. Disable Secure Boot and retry" echo "Secure Boot is Enabled. Kdump service can't be started. Disable Secure Boot and retry"
@ -591,7 +593,7 @@ function check_kdump_feasibility()
fi fi
} }
function check_fence_kdump_config() check_fence_kdump_config()
{ {
local hostname=`hostname` local hostname=`hostname`
local nodes=$(get_option_value "fence_kdump_nodes") local nodes=$(get_option_value "fence_kdump_nodes")
@ -606,7 +608,7 @@ function check_fence_kdump_config()
return 0 return 0
} }
function start() start()
{ {
check_config check_config
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -656,7 +658,7 @@ function start()
echo "Starting kdump: [OK]" echo "Starting kdump: [OK]"
} }
function stop() stop()
{ {
$KEXEC -p -u 2>/dev/null $KEXEC -p -u 2>/dev/null
if [ $? == 0 ]; then if [ $? == 0 ]; then
@ -664,7 +666,7 @@ function stop()
echo "Stopping kdump: [OK]" echo "Stopping kdump: [OK]"
return 0 return 0
else else
echo "kexec: failed to unloaded kdump kernel" echo "kexec: failed to unload kdump kernel"
echo "Stopping kdump: [FAILED]" echo "Stopping kdump: [FAILED]"
return 1 return 1
fi fi