Re: [PATCH] Clarify "Press any key to continue..." message

[Vladimir 'φ-coder/phcoder' Serbinenko]

Go ahead
On 03.04.2014 16:23, Colin Watson wrote:
> When grub_wait_after_message says "Press any key to continue...", it
> really means that it will continue anyway after a short delay, but that
> you can press a key to skip the delay.  Unfortunately, the delay is just
> long enough that in practice a number of users have time to see it,
> press a key, and then report a bug saying that their system won't boot
> without manual intervention, even though it would have booted just fine
> if they'd left it alone.  Rephrase this message to make it clearer
> what's really happening.
> 
> * grub-core/normal/menu.c (grub_wait_after_message): Rephrase
> message to make it clear that GRUB will continue even if the user
> does not press a key.
> ---
>  ChangeLog               | 6 ++++++
>  grub-core/normal/menu.c | 4 +++-
>  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/ChangeLog b/ChangeLog
> index 6eca73e..53c2aff 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,9 @@
> +2014-04-03  Colin Watson  <address@hidden>
> +
> +     * grub-core/normal/menu.c (grub_wait_after_message): Rephrase
> +     message to make it clear that GRUB will continue even if the user
> +     does not press a key.
> +
>  2014-03-31  Thomas Falcon <address@hidden>
>  
>       btrfs: fix get_root key comparison failures due to endianness
> diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
> index b47991a..a6fa93c 100644
> --- a/grub-core/normal/menu.c
> +++ b/grub-core/normal/menu.c
> @@ -63,7 +63,9 @@ grub_wait_after_message (void)
>  {
>    grub_uint64_t endtime;
>    grub_xputs ("\n");
> -  grub_printf_ (N_("Press any key to continue..."));
> +  grub_printf_ (N_(
> +    "Waiting a moment so that you can read previous messages.\n"
> +    "Press any key to skip this delay..."));
>    grub_refresh ();
>  
>    endtime = grub_get_time_ms () + 10000;
>

signature.asc
Description: OpenPGP digital signature