Revert "use rainbow deer on the grub background"

libreboot has a lot of users worldwide, some of whom live in countries that punish being gay; if they look at libreboot or boot it and it has the pride colours on it, it could actually get them in trouble. this fact occured to me, and i've decided therefore to revert back to the boring plain logo. though, perhaps we could actually properly design a new logo? a new, modern logo, and a nicer website. we'll see! This reverts commit 401efb24b2.
rom.sh: insert grub background in cbfs not memdisk
2026-03-25 21:39:03 +02:00 · 2024-12-17 12:32:17 +00:00 · 2024-12-17 01:02:03 +00:00 · 2024-12-17 00:57:05 +00:00 · 2024-12-13 06:28:05 +00:00
2 changed files with 6 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@
 /dump/
 /qrun*.sh
 *.tar.*
+/m
+/f
--- 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()
Author	SHA1	Message	Date
Leah Rowe	eafc82028a	Revert "use rainbow deer on the grub background" libreboot has a lot of users worldwide, some of whom live in countries that punish being gay; if they look at libreboot or boot it and it has the pride colours on it, it could actually get them in trouble. this fact occured to me, and i've decided therefore to revert back to the boring plain logo. though, perhaps we could actually properly design a new logo? a new, modern logo, and a nicer website. we'll see! This reverts commit `401efb24b2`.	2024-12-17 12:32:17 +00:00
Leah Rowe	44969c73bd	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 <leah@libreboot.org>	2024-12-17 01:02:03 +00:00
Leah Rowe	401efb24b2	use rainbow deer on the grub background same as on u-boot recently Signed-off-by: Leah Rowe <leah@libreboot.org>	2024-12-17 00:57:05 +00:00
Leah Rowe	dc27cb9178	add some scripts to .gitignore f/m are scripts i'm gradually working on. easy flash scripts for lbmk. no promises when/if i push them. Signed-off-by: Leah Rowe <leah@libreboot.org>	2024-12-13 06:28:05 +00:00