From 44969c73bd2d85fd79aa4a431a8169c48375886f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 17 Dec 2024 01:02:03 +0000 Subject: rom.sh: insert grub background in cbfs not memdisk 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 --- include/rom.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/rom.sh') diff --git a/include/rom.sh b/include/rom.sh index 2d20a8a7..8d9cdf40 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -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 } @@ -165,6 +164,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() -- cgit v1.2.1