Enable xtrace in mkdumprd, mkfadumprd and dracut when kdumpctl enables xtrace

Resolves: #118

Since dracut commit 5042681("fix(dracut.sh): initialize variables that
get exported"), debug=1 won't enable xtrace in dracut. Let's call dracut
with --debug explicitly in mkdumprd and mkfadumprd.

Also enable xtrace in mkdumprd and mkfadumprd by passing --debug
argument when kdumpctl enables xtrace.

Signed-off-by: Coiby Xu <coxu@redhat.com>

Author: coiby

kdumpctl

@@ -4,8 +4,16 @@ KEXEC=/sbin/kexec
 KDUMP_KERNELVER=""
 KDUMP_KERNEL=""
 KEXEC_ARGS=""
-MKDUMPRD="/sbin/mkdumprd -f"
+
+MKDUMPRD="/sbin/mkdumprd"
 MKFADUMPRD="/sbin/mkfadumprd"
+
+if shopt -q -o xtrace; then
+	MKDUMPRD+=" --debug"
+	MKFADUMPRD+=" --debug"
+fi
+MKDUMPRD+=" -f"
+
 DRACUT_MODULES_FILE="/usr/lib/dracut/modules.txt"
 
 # Path to the initrd used for normal boot. Used to determine the naming

mkdumprd

@@ -6,7 +6,10 @@
 # Written by Cong Wang <amwang@redhat.com>
 #
 
-[[ -n $debug ]] && set -x
+if [[ $1 == --debug ]]; then
+	set -x
+	shift
+fi
 
 if [[ -f /etc/sysconfig/kdump ]]; then
 	# shellcheck source=/dev/null
@@ -32,7 +35,11 @@ SSH_KEY_LOCATION=$DEFAULT_SSHKEY
 SAVE_PATH=$(get_save_path)
 
 declare -a dracut_args
-dracut_args+=(--quiet)
+if [[ -n $debug ]]; then
+	dracut_args+=(--debug)
+else
+	dracut_args+=(--quiet)
+fi
 dracut_args+=(--hostonly)
 dracut_args+=(--hostonly-cmdline)
 dracut_args+=(--hostonly-i18n)

mkfadumprd

@@ -2,6 +2,17 @@
 # Generate an initramfs image that isolates dump capture capability within
 # the default initramfs using zz-fadumpinit dracut module.
 
+MKDUMPRD="/sbin/mkdumprd"
+if [[ $1 == --debug ]]; then
+	set -x
+	shift
+	MKDUMPRD+=" --debug"
+	debug_dracut=--debug
+else
+	debug_dracut=--quiet
+fi
+MKDUMPRD+=" -f"
+
 if [[ -f /etc/sysconfig/kdump ]]; then
 	# shellcheck source=/dev/null
 	. /etc/sysconfig/kdump
@@ -33,7 +44,6 @@ trap '
 # clean up after ourselves no matter how we die.
 trap 'exit 1;' SIGINT
 
-MKDUMPRD="/sbin/mkdumprd -f"
 # Default boot initramfs to be rebuilt
 REBUILD_INITRD="$1" && shift
 TARGET_INITRD="$1" && shift
@@ -74,6 +84,6 @@ if ! have_compression_in_dracut_args; then
 	fi
 fi
 
-if ! dracut --force --quiet "${_dracut_isolate_args[@]}" "$@" "$TARGET_INITRD"; then
+if ! dracut "$debug_dracut"  --force --quiet "${_dracut_isolate_args[@]}" "$@" "$TARGET_INITRD"; then
 	perror_exit "mkfadumprd: failed to setup '$TARGET_INITRD' with dump capture capability"
 fi