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(a)linux.vnet.ibm.com>
---
kdumpctl | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/kdumpctl b/kdumpctl
index e86bee0..5c8796b 100755
--- a/kdumpctl
+++ b/kdumpctl
@@ -42,7 +42,7 @@ determine_dump_mode()
# remove_cmdline_param <kernel cmdline> <param1> [<param2>] ...
[<paramN>]
# 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.
-function remove_cmdline_param()
+remove_cmdline_param()
{
local cmdline=$1
shift
@@ -60,7 +60,7 @@ function remove_cmdline_param()
# This function returns the "initial apicid" of the
# boot cpu (cpu 0) if present.
#
-function get_bootcpu_initial_apicid()
+get_bootcpu_initial_apicid()
{
awk ' \
BEGIN { CPU = "-1"; } \
@@ -73,7 +73,7 @@ function get_bootcpu_initial_apicid()
#
# This function appends argument "$2=$3" to string ($1) if not already
present.
#
-function append_cmdline()
+append_cmdline()
{
local cmdline=$1
local newstr=${cmdline/$2/""}
@@ -87,7 +87,7 @@ function append_cmdline()
}
# This function performs a series of edits on the command line
-function prepare_cmdline()
+prepare_cmdline()
{
local cmdline;
if [ -z "$KDUMP_COMMANDLINE" ]; then
@@ -109,7 +109,7 @@ function prepare_cmdline()
}
-function save_core()
+save_core()
{
coredir="/var/crash/`date +"%Y-%m-%d-%H:%M"`"
@@ -176,7 +176,7 @@ rebuild_initrd()
}
#$1: the files to be checked with IFS=' '
-function check_exist()
+check_exist()
{
for file in $1; do
if [ ! -f "$file" ]; then
@@ -187,7 +187,7 @@ function check_exist()
}
#$1: the files to be checked with IFS=' '
-function check_executable()
+check_executable()
{
for file in $1; do
if [ ! -x "$file" ]; then
@@ -208,7 +208,7 @@ backup_initrd()
fi
}
-function check_config()
+check_config()
{
local nr
@@ -274,7 +274,7 @@ get_pcs_cluster_modified_files()
echo $modified_files
}
-function check_rebuild()
+check_rebuild()
{
local extra_modules modified_files=""
local _force_rebuild force_rebuild="0"
@@ -346,7 +346,7 @@ function check_rebuild()
elif [ "$force_rebuild" != "0" ]; then
echo -n "Force rebuild $TARGET_INITRD"; echo
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'
else
return 0
@@ -359,7 +359,7 @@ function check_rebuild()
# This function check iomem and determines if we have more than
# 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, "-"); \
print (strtonum("0x" r[2]) > strtonum("0xffffffff")); }'`
@@ -368,7 +368,7 @@ function need_64bit_headers()
# Load the kdump kerel specified in /etc/sysconfig/kdump
# If none is specified, try to load a kdump kernel with the same version
# as the currently running kernel.
-function load_kdump()
+load_kdump()
{
MEM_RESERVED=$(cat /sys/kernel/kexec_crash_size)
if [ $MEM_RESERVED -eq 0 ]
@@ -415,7 +415,7 @@ function load_kdump()
fi
}
-function check_ssh_config()
+check_ssh_config()
{
while read config_opt config_val; do
# remove inline comments after the end of a directive.
@@ -448,7 +448,7 @@ function check_ssh_config()
return 0
}
-function check_ssh_target()
+check_ssh_target()
{
local _ret
ssh -q -i $SSH_KEY_LOCATION -o BatchMode=yes $DUMP_TARGET mkdir -p $SAVE_PATH
@@ -460,7 +460,7 @@ function check_ssh_target()
return 0
}
-function propagate_ssh_key()
+propagate_ssh_key()
{
check_ssh_config
if [ $? -ne 0 ]; then
@@ -516,7 +516,7 @@ check_current_fadump_status()
return 1
}
-function check_current_kdump_status()
+check_current_kdump_status()
{
rc=`cat /sys/kernel/kexec_crash_loaded`
if [ $rc == 1 ]; then
@@ -537,7 +537,7 @@ check_current_status()
return $?
}
-function save_raw()
+save_raw()
{
local kdump_dir
local raw_target
@@ -648,7 +648,7 @@ selinux_relabel()
# is 1 and SetupMode is 0, then secure boot is being enforced.
#
# 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_byte setup_mode_byte
@@ -668,7 +668,7 @@ function is_secure_boot_enforced()
return 1
}
-function check_kdump_feasibility()
+check_kdump_feasibility()
{
if is_secure_boot_enforced; then
echo "Secure Boot is Enabled. Kdump service can't be started. Disable Secure
Boot and retry"
@@ -681,7 +681,7 @@ function check_kdump_feasibility()
fi
}
-function check_fence_kdump_config()
+check_fence_kdump_config()
{
local hostname=`hostname`
local nodes=$(get_option_value "fence_kdump_nodes")
@@ -729,7 +729,7 @@ start_dump()
return $?
}
-function start()
+start()
{
check_config
if [ $? -ne 0 ]; then
@@ -796,7 +796,7 @@ stop_kdump()
{
$KEXEC -p -u 2>/dev/null
if [ $? != 0 ]; then
- echo "kexec: failed to unloaded kdump kernel"
+ echo "kexec: failed to unload kdump kernel"
return 1
fi
@@ -804,7 +804,7 @@ stop_kdump()
return 0
}
-function stop()
+stop()
{
if [ $DEFAULT_DUMP_MODE == "fadump" ]; then
stop_fadump