From 28cf217362d3532f6207a02f3b3dadeda8dedd6c Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Nov 09 2021 13:45:45 +0000 Subject: dracut-kdump.sh: don't put KDUMP_SCRIPT_DIR in PATH upstream: fedora resolves: bz2003832 conflict: none commit 0675edbadb2320b8809aa8751b356ccafc78d857 Author: Kairui Song Date: Mon Aug 2 01:19:44 2021 +0800 dracut-kdump.sh: don't put KDUMP_SCRIPT_DIR in PATH monitor_dd_progress is the only extra binary in KDUMP_SCRIPT_DIR, no need to change PATH environment variable, just call it directly. Signed-off-by: Kairui Song Acked-by: Philipp Rudo Signed-off-by: Tao Liu --- diff --git a/dracut-kdump.sh b/dracut-kdump.sh index a785ab9..54e9713 100755 --- a/dracut-kdump.sh +++ b/dracut-kdump.sh @@ -24,7 +24,6 @@ DATEDIR=`date +%Y-%m-%d-%T` HOST_IP='127.0.0.1' DUMP_INSTRUCTION="" SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa" -KDUMP_SCRIPT_DIR="/kdumpscripts" DD_BLKSIZE=512 FINAL_ACTION="systemctl reboot -f" KDUMP_PRE="" @@ -35,8 +34,6 @@ OPALCORE="/sys/firmware/opal/mpipl/core" set -o pipefail DUMP_RETVAL=0 -export PATH=$PATH:$KDUMP_SCRIPT_DIR - get_kdump_confs() { local config_opt config_val @@ -378,7 +375,7 @@ dump_raw() if ! $(echo -n $CORE_COLLECTOR|grep -q makedumpfile); then _src_size=`ls -l /proc/vmcore | cut -d' ' -f5` _src_size_mb=$(($_src_size / 1048576)) - monitor_dd_progress $_src_size_mb & + /kdumpscripts/monitor_dd_progress $_src_size_mb & fi dinfo "saving vmcore"