diff --git a/initrd/bin/kexec-boot b/initrd/bin/kexec-boot
index 6eede6ea..ccc59a01 100755
--- a/initrd/bin/kexec-boot
+++ b/initrd/bin/kexec-boot
@@ -151,7 +151,7 @@ if [ "$dryrun" = "y" ]; then exit 0; fi
 
 echo "Loading the new kernel:"
 echo "$kexeccmd"
-DO_WITH_DEBUG "$kexeccmd" \
+DO_WITH_DEBUG eval "$kexeccmd" \
 || die "Failed to load the new kernel"
 
 if [ "$CONFIG_DEBUG_OUTPUT" = "y" ];then
diff --git a/initrd/etc/functions b/initrd/etc/functions
index e817aea0..7ad0d794 100755
--- a/initrd/etc/functions
+++ b/initrd/etc/functions
@@ -763,7 +763,7 @@ scan_boot_options() {
 
 	if [ -r $option_file ]; then rm $option_file; fi
 	for i in $(find $bootdir -name "$config"); do
-		kexec-parse-boot "$bootdir" "$i" >>$option_file
+		DO_WITH_DEBUG kexec-parse-boot "$bootdir" "$i" >>$option_file
 	done
 	# FC29/30+ may use BLS format grub config files
 	# https://fedoraproject.org/wiki/Changes/BootLoaderSpecByDefault