summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-11-11 16:47:32 (GMT)
committer Peter Korsgaard <peter@korsgaard.com>2013-12-01 22:44:07 (GMT)
commit741740cee6e88eb14600a95b8fdd06f32a9fb271 (patch)
tree8ae83e21dfb2a314fd382fae517e609807dd7e84
parentbba9eb1ea4739c9b3db3a4ee24fe1e754ddcc70c (diff)
downloadbuildroot-741740cee6e88eb14600a95b8fdd06f32a9fb271.tar.gz
buildroot-741740cee6e88eb14600a95b8fdd06f32a9fb271.tar.bz2
grub: adjust splashimage in menu.lst depending on configuration
Make the splashimage line in menu.lst only active when splashimage support has really been enabled in the Grub configuration. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--boot/grub/grub.mk1
-rw-r--r--boot/grub/menu.lst2
2 files changed, 2 insertions, 1 deletions
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 0c2c035..f15d915 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -66,6 +66,7 @@ GRUB_CONF_OPT = \
ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
define GRUB_INSTALL_SPLASH
cp boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/
+ $(SED) 's/^#splashimage/splashimage/' $(TARGET_DIR)/boot/grub/menu.lst
endef
endif
diff --git a/boot/grub/menu.lst b/boot/grub/menu.lst
index 41e9b62..7845fee 100644
--- a/boot/grub/menu.lst
+++ b/boot/grub/menu.lst
@@ -1,6 +1,6 @@
default=0
timeout=5
-splashimage=(hd0,0)/boot/grub/splash.xpm.gz
+#splashimage=(hd0,0)/boot/grub/splash.xpm.gz
hiddenmenu
title Buildroot
root (hd0,0)