canoeboot-mirror/cbmk
1
0
Fork 0
mirror of https://codeberg.org/canoeboot/cbmk.git synced 2025-05-11 17:55:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rom.sh: insert grub background in cbfs not memdisk

Browse source 
for some reason, when the background is in memdisk, inserting
it into cbfs afterward doesn't override, despite this
being the behaviour in grub.cfg

put it in cbfs explicitly, and skip inserting into memdisk

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe 2024-12-17 01:02:03 +00:00
parent 5ebeb65cbf
commit 73920cb0a1
1 changed files with 4 additions and 2 deletions

6
include/rom.sh
View file

@ -44,8 +44,7 @@ mkpayload_grub()
--fonts= --themes= --locales= --modules="$grub_modules" \
--install-modules="$grub_install_modules" \
"/boot/grub/grub_default.cfg=${srcdir}/.config" \
"/boot/grub/grub.cfg=$grubdata/memdisk.cfg" \
"/background.png=$grubdata/background/background1280x800.png" || \
"/boot/grub/grub.cfg=$grubdata/memdisk.cfg" || \
$err "$tree: cannot build grub.elf"; return 0
}
@ -163,6 +162,9 @@ add_grub()
printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" \
> "$TMPDIR/tmpcfg" || $err "$target: !insert scandisk"
cbfs "$tmprom" "$TMPDIR/tmpcfg" scan.cfg raw
[ "$initmode" != "normal" ] && [ "$displaymode" != "txtmode" ] && \
cbfs "$tmprom" "$grubdata/background/background1280x800.png" \
"background.png" raw; :
}
mkseagrub()