The function has many block of the kind
if ! cmd; then
derror "Starting kdump: [FAILED]"
return 1
fi
This duplicates code and makes the function hard to read. Thus move the
block to the calling function.
Signed-off-by: Philipp Rudo <prudo(a)redhat.com>
---
kdumpctl | 44 +++++++++++++++-----------------------------
1 file changed, 15 insertions(+), 29 deletions(-)
diff --git a/kdumpctl b/kdumpctl
index de274c6..77ed584 100755
--- a/kdumpctl
+++ b/kdumpctl
@@ -986,46 +986,26 @@ check_final_action_config()
start()
{
- if ! check_dump_feasibility; then
- derror "Starting kdump: [FAILED]"
- return 1
- fi
-
- if ! parse_config; then
- derror "Starting kdump: [FAILED]"
- return 1
- fi
+ check_dump_feasibility || return
+ parse_config || return
if sestatus 2> /dev/null | grep -q "SELinux status.*enabled"; then
selinux_relabel
fi
- if ! save_raw; then
- derror "Starting kdump: [FAILED]"
- return 1
- fi
+ save_raw || return
if [[ $DEFAULT_DUMP_MODE == "kdump" ]] && is_kernel_loaded
"kdump"; then
dwarn "Kdump already running: [WARNING]"
return 0
fi
- if ! check_and_wait_network_ready; then
- derror "Starting kdump: [FAILED]"
- return 1
- fi
-
- if ! check_rebuild; then
- derror "Starting kdump: [FAILED]"
- return 1
- fi
-
- if ! start_dump; then
- derror "Starting kdump: [FAILED]"
- return 1
- fi
+ check_and_wait_network_ready || return
+ check_rebuild || return
+ start_dump || return
dinfo "Starting kdump: [OK]"
+ return 0
}
reload()
@@ -1698,7 +1678,10 @@ main()
case "$1" in
start)
- start
+ if ! start; then
+ derror "Starting kdump: [FAILED]"
+ exit 1
+ fi
;;
stop)
stop
@@ -1723,7 +1706,10 @@ main()
;;
restart)
stop
- start
+ if ! start; then
+ derror "Starting kdump: [FAILED]"
+ exit 1
+ fi
;;
rebuild)
rebuild
--
2.39.0