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>

diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 0c2c035096c117038f46c1278ef6077db14689f5..f15d91574d2d959be5ec9fdd22282c1e307aed2c 100644 (file)
--- 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 41e9b62b003b7568f530b295f1a885d0fe3bb8dd..7845feea7c24fbdab8955880c9fd9e912ea6444b 100644 (file)
--- 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)