[PATCH 34/47] dracut-kdump.sh: remove add_dump_code
`add_dump_code "<op>"` is just `DUMP_INSTRUCTION="<op>"`,
no need a
extra wrapper for that.
Signed-off-by: Kairui Song <kasong(a)redhat.com>
---
dracut-kdump.sh | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index d654421c..62851c46 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -41,9 +41,7 @@ DUMP_RETVAL=0
get_kdump_confs()
{
- local config_opt config_val
-
- while read config_opt config_val;
+ while read -r config_opt config_val;
do
# remove inline comments after the end of a directive.
case "$config_opt" in
@@ -364,11 +362,6 @@ do_kdump_post()
fi
}
-add_dump_code()
-{
- DUMP_INSTRUCTION=$1
-}
-
dump_raw()
{
local _raw=$1
@@ -552,18 +545,18 @@ read_kdump_confs()
config_val=$(get_dracut_args_target "$config_val")
if [ -n "$config_val" ]; then
config_val=$(get_mntpoint_from_target "$config_val")
- add_dump_code "dump_fs $config_val"
+ DUMP_INSTRUCTION="dump_fs $config_val"
fi
;;
ext[234]|xfs|btrfs|minix|nfs)
config_val=$(get_mntpoint_from_target "$config_val")
- add_dump_code "dump_fs $config_val"
+ DUMP_INSTRUCTION="dump_fs $config_val"
;;
raw)
- add_dump_code "dump_raw $config_val"
+ DUMP_INSTRUCTION="dump_raw $config_val"
;;
ssh)
- add_dump_code "dump_ssh $SSH_KEY_LOCATION $config_val"
+ DUMP_INSTRUCTION="dump_ssh $SSH_KEY_LOCATION $config_val"
;;
esac
done <<< "$(kdump_read_conf)"
@@ -594,7 +587,7 @@ if [ $? -ne 0 ]; then
fi
if [ -z "$DUMP_INSTRUCTION" ]; then
- add_dump_code "dump_fs $NEWROOT"
+ DUMP_INSTRUCTION="dump_fs $NEWROOT"
fi
do_kdump_pre
--
2.31.1