From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yann E. MORIN <yann.morin.1998@free.fr>
Date: Sat, 28 Dec 2013 22:14:25 +0100
Subject: [Buildroot] [PATCH 9/9] grub: align splashscreen handling with
 iso9660 code
In-Reply-To: <1388242600-2580-10-git-send-email-thomas.petazzoni@free-electrons.com>
References: <1388242600-2580-1-git-send-email-thomas.petazzoni@free-electrons.com>
 <1388242600-2580-10-git-send-email-thomas.petazzoni@free-electrons.com>
Message-ID: <20131228211425.GM3373@free.fr>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

Thomas, All,

On 2013-12-28 15:56 +0100, Thomas Petazzoni spake thusly:
> 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>
> ---
>  boot/grub/grub.mk  |  5 ++++-
>  boot/grub/menu.lst | 11 +++++++----
>  2 files changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
> index 3be4a74..d22df88 100644
> --- a/boot/grub/grub.mk
> +++ b/boot/grub/grub.mk
> @@ -82,7 +82,10 @@ 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
> +else
> +define GRUB_INSTALL_SPLASH
> +	$(SED) '/^splashimage/d' $(TARGET_DIR)/boot/grub/menu.lst
>  endef
>  endif
>  
> diff --git a/boot/grub/menu.lst b/boot/grub/menu.lst
> index 7845fee..09426f2 100644
> --- a/boot/grub/menu.lst
> +++ b/boot/grub/menu.lst
> @@ -1,7 +1,10 @@
> -default=0
> -timeout=5
> -#splashimage=(hd0,0)/boot/grub/splash.xpm.gz
> -hiddenmenu
> +default		0
> +timeout		10
> +color 		cyan/blue white/blue
> +splashimage	(hd0,0)/boot/grub/splash.xpm.gz
> +foreground 	000000
> +background 	cccccc

Ditto, see my reply to the previous patch.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'