From d3656bbe65c4ac71a0d6ac205cedce071b768788 Mon Sep 17 00:00:00 2001 From: Jonathon Hall Date: Fri, 19 Apr 2024 13:35:17 -0400 Subject: [PATCH] kexec-boot, functions: Restore eval and DO_WITH_DEBUG that were deleted `eval "$kexeccmd"` should become `DO_WITH_DEBUG eval "$kexeccmd"` when adding DO_WITH_DEBUG, command invocation is still the same, still needs eval. Restore DO_WITH_DEBUG in front of kexec-parse-boot that had been removed. Signed-off-by: Jonathon Hall --- initrd/bin/kexec-boot | 2 +- initrd/etc/functions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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