Skip to content

Commit 5c83874

Browse files
committed
binary_syslinux: Do not modify grub theme.txt if grub/splash.png exists
If grub/splash.png exists, assume the configuration editor intends to have a grub-specific splash.png, and do not modify theme.txt. But if syslinux has the only known splash.png, use it for both syslinux and grub. (This allows for a hybrid image where the grub side can have e.g. a 16:9 1920x1080 splash.png which gets grub is capable of automatically scaling, while the syslinux side has a 640x480 splash.png which effectively must be this fixed size.)
1 parent dc1a03d commit 5c83874

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/build/binary_syslinux

+2-2
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,8 @@ then
313313
fi
314314
rm -f "${_TARGET}/splash.svg"
315315

316-
# Tweak the grub theme to reuse the syslinux background image
317-
if [ -e binary/boot/grub/live-theme/theme.txt ]; then
316+
# Tweak the grub theme to reuse the syslinux background image if grub doesn't have its own
317+
if [ -e binary/boot/grub/live-theme/theme.txt ] && [ ! -e binary/boot/grub/splash.png ]; then
318318
sed -i -e 's|^desktop-image:.*|desktop-image: "/isolinux/splash.png"|' \
319319
-e 's|^title-text:.*|title-text: ""|' \
320320
binary/boot/grub/live-theme/theme.txt

0 commit comments

Comments
 (0)