ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-03-23 04:25:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kexec-boot, functions: Restore eval and DO_WITH_DEBUG that were deleted

Browse Source 
`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 <jonathon.hall@puri.sm>
This commit is contained in:
Jonathon Hall 2024-04-19 13:35:17 -04:00
parent d8810b7032
commit d3656bbe65
No known key found for this signature in database
GPG Key ID: 1E9C3CA91AE25114
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
initrd/bin/kexec-boot
View File

@ -151,7 +151,7 @@ if [ "$dryrun" = "y" ]; then exit 0; fi
echo "Loading the new kernel:" echo "Loading the new kernel:"
echo "$kexeccmd" echo "$kexeccmd"
DO_WITH_DEBUG "$kexeccmd" \ DO_WITH_DEBUG eval "$kexeccmd" \
|| die "Failed to load the new kernel" || die "Failed to load the new kernel"
if [ "$CONFIG_DEBUG_OUTPUT" = "y" ];then if [ "$CONFIG_DEBUG_OUTPUT" = "y" ];then

2
initrd/etc/functions
View File

@ -763,7 +763,7 @@ scan_boot_options() {
if [ -r $option_file ]; then rm $option_file; fi if [ -r $option_file ]; then rm $option_file; fi
for i in $(find $bootdir -name "$config"); do 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 done
# FC29/30+ may use BLS format grub config files # FC29/30+ may use BLS format grub config files
# https://fedoraproject.org/wiki/Changes/BootLoaderSpecByDefault # https://fedoraproject.org/wiki/Changes/BootLoaderSpecByDefault