diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-12-17 01:02:03 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-12-17 01:02:03 +0000 |
| commit | 44969c73bd2d85fd79aa4a431a8169c48375886f (patch) | |
| tree | fc12e2e8ad80ef5e5341a4ec72007d1a92ce2c4d | |
| parent | 401efb24b2213454732e769531f660605771e538 (diff) | |
rom.sh: insert grub background in cbfs not memdiskHEAD20241206rev4master
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>
| -rw-r--r-- | include/rom.sh | 6 |
1 files changed, 4 insertions, 2 deletions
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() |