jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

grub: align splashscreen handling with iso9660 code

Browse Source 
This commit aligns the Grub handling of the splash screen with what is
done in the ISO9660 code.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
This commit is contained in:
Thomas Petazzoni 2013-12-29 18:33:47 +01:00
parent e962b2a2f3
commit 5cab919bb3
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot/grub/grub.mk
View File

@ -82,7 +82,10 @@ GRUB_CONF_OPT = \
ifeq ($(BR2_TARGET_GRUB_SPLASH),y) ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
define GRUB_INSTALL_SPLASH define GRUB_INSTALL_SPLASH
cp boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/ cp boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/
$(SED) 's/^#splashimage/splashimage/' $(TARGET_DIR)/boot/grub/menu.lst endef
else
define GRUB_INSTALL_SPLASH
$(SED) '/^splashimage/d' $(TARGET_DIR)/boot/grub/menu.lst
endef endef
endif endif

17
boot/grub/menu.lst
View File

@ -1,7 +1,16 @@
default=0 default 0
timeout=5 timeout 10
#splashimage=(hd0,0)/boot/grub/splash.xpm.gz
hiddenmenu # Used when no splashimage is used
color cyan/blue white/blue
# Gets enabled/disabled depending on Grub support for splashimage
splashimage (hd0,0)/boot/grub/splash.xpm.gz
# Used when a splashimage is enabled
foreground 000000
background cccccc
title Buildroot title Buildroot
root (hd0,0) root (hd0,0)
kernel /boot/bzImage rw root=/dev/sda1 kernel /boot/bzImage rw root=/dev/sda1