[PATCH v2 08/49] mkdumprd: use kdump_get_conf_val to read config values

[Kairui Song]

Simplify the code and cover more corner cases.

Signed-off-by: Kairui Song <kasong(a)redhat.com&gt;
---
 mkdumprd | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/mkdumprd b/mkdumprd
index d5545114..94f6aff8 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -23,7 +23,6 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-conf_file="/etc/kdump.conf"
 SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa"
 SAVE_PATH=$(get_save_path)
 OVERRIDE_RESETTABLE=0
@@ -312,19 +311,6 @@ handle_default_dump_target()
     check_size fs $_target
 }
 
-get_override_resettable()
-{
-    local override_resettable
-
-    override_resettable=$(grep "^override_resettable" $conf_file)
-    if [ -n "$override_resettable" ]; then
-        OVERRIDE_RESETTABLE=$(echo $override_resettable | cut -d' '  -f2)
-        if [ "$OVERRIDE_RESETTABLE" != "0" ] && [
"$OVERRIDE_RESETTABLE" != "1" ];then
-            perror_exit "override_resettable value $OVERRIDE_RESETTABLE is
invalid"
-        fi
-    fi
-}
-
 # $1: function name
 for_each_block_target()
 {
@@ -363,9 +349,10 @@ is_unresettable()
 #return true if resettable
 check_resettable()
 {
-    local _ret _target
+    local _ret _target _override_resettable
 
-    get_override_resettable
+    _override_resettable=$(kdump_get_conf_val override_resettable)
+    OVERRIDE_RESETTABLE=${_override_resettable:-$OVERRIDE_RESETTABLE}
 
     for_each_block_target is_unresettable
     _ret=$?
@@ -395,7 +382,7 @@ if ! check_crypt; then
 fi
 
 # firstly get right SSH_KEY_LOCATION
-keyfile=$(awk '/^sshkey/ {print $2}' $conf_file)
+keyfile=$(kdump_get_conf_val sshkey)
 if [ -f "$keyfile" ]; then
     # canonicalize the path
     SSH_KEY_LOCATION=$(/usr/bin/readlink -m $keyfile)
-- 
2.31.1