12341958d2
On some devices the ESC key is the hotkey to enter the BIOS/EFI setup screen, making it really hard to time pressing it right. Besides that ESC is also pretty hard to discover for a user who does not know it will unhide the menu. This commit makes F4, which was chosen because is not used as a hotkey to enter the BIOS setup by any vendor, also interrupt sleeps / stop the menu countdown. This solves the ESC gets into the BIOS setup and also somewhat solves the discoverability issue, but leaves the timing issue unresolved. This commit fixes the timing issue by also adding support for keeping SHIFT pressed during boot to stop the menu countdown. This matches what Ubuntu is doing, which should also help with discoverability. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
117 lines
2.7 KiB
C
117 lines
2.7 KiB
C
/* sleep.c - Command to wait a specified number of seconds. */
|
||
/*
|
||
* GRUB -- GRand Unified Bootloader
|
||
* Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
|
||
*
|
||
* GRUB is free software: you can redistribute it and/or modify
|
||
* it under the terms of the GNU General Public License as published by
|
||
* the Free Software Foundation, either version 3 of the License, or
|
||
* (at your option) any later version.
|
||
*
|
||
* GRUB is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
* GNU General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU General Public License
|
||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||
*/
|
||
|
||
#include <grub/dl.h>
|
||
#include <grub/term.h>
|
||
#include <grub/time.h>
|
||
#include <grub/types.h>
|
||
#include <grub/misc.h>
|
||
#include <grub/extcmd.h>
|
||
#include <grub/i18n.h>
|
||
|
||
GRUB_MOD_LICENSE ("GPLv3+");
|
||
|
||
static const struct grub_arg_option options[] =
|
||
{
|
||
{"verbose", 'v', 0, N_("Verbose countdown."), 0, 0},
|
||
{"interruptible", 'i', 0, N_("Allow to interrupt with ESC."), 0, 0},
|
||
{0, 0, 0, 0, 0, 0}
|
||
};
|
||
|
||
static struct grub_term_coordinate *pos;
|
||
|
||
static void
|
||
do_print (int n)
|
||
{
|
||
grub_term_restore_pos (pos);
|
||
/* NOTE: Do not remove the trailing space characters.
|
||
They are required to clear the line. */
|
||
grub_printf ("%d ", n);
|
||
grub_refresh ();
|
||
}
|
||
|
||
/* Based on grub_millisleep() from kern/generic/millisleep.c. */
|
||
static int
|
||
grub_interruptible_millisleep (grub_uint32_t ms)
|
||
{
|
||
grub_uint64_t start;
|
||
|
||
start = grub_get_time_ms ();
|
||
|
||
while (grub_get_time_ms () - start < ms)
|
||
if (grub_key_is_interrupt (grub_getkey_noblock ()))
|
||
return 1;
|
||
|
||
return 0;
|
||
}
|
||
|
||
static grub_err_t
|
||
grub_cmd_sleep (grub_extcmd_context_t ctxt, int argc, char **args)
|
||
{
|
||
struct grub_arg_list *state = ctxt->state;
|
||
int n;
|
||
|
||
if (argc != 1)
|
||
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
|
||
|
||
n = grub_strtoul (args[0], 0, 10);
|
||
|
||
if (n == 0)
|
||
{
|
||
/* Either `0' or broken input. */
|
||
return 0;
|
||
}
|
||
|
||
grub_refresh ();
|
||
|
||
pos = grub_term_save_pos ();
|
||
|
||
for (; n; n--)
|
||
{
|
||
if (state[0].set)
|
||
do_print (n);
|
||
|
||
if (state[1].set)
|
||
{
|
||
if (grub_interruptible_millisleep (1000))
|
||
return 1;
|
||
}
|
||
else
|
||
grub_millisleep (1000);
|
||
}
|
||
if (state[0].set)
|
||
do_print (0);
|
||
|
||
return 0;
|
||
}
|
||
|
||
static grub_extcmd_t cmd;
|
||
|
||
GRUB_MOD_INIT(sleep)
|
||
{
|
||
cmd = grub_register_extcmd ("sleep", grub_cmd_sleep, 0,
|
||
N_("NUMBER_OF_SECONDS"),
|
||
N_("Wait for a specified number of seconds."),
|
||
options);
|
||
}
|
||
|
||
GRUB_MOD_FINI(sleep)
|
||
{
|
||
grub_unregister_extcmd (cmd);
|
||
}
|