diff options
| author | Angel Perez | 2021-08-06 22:08:48 -0400 |
|---|---|---|
| committer | Angel Perez | 2021-08-06 22:08:48 -0400 |
| commit | ebd26a27644230b849bbd020e6a4d9906124aa0e (patch) | |
| tree | 9f45ef35a06d46af49d6c86e508f4592655dfe1d /05-sleep_shift.patch | |
| parent | 1a29abcaf8017525d09d5b8b60bf7a2fb18895dc (diff) | |
| download | aur-ebd26a27644230b849bbd020e6a4d9906124aa0e.tar.gz | |
Solved errors in Ubuntu grub patches
Diffstat (limited to '05-sleep_shift.patch')
| -rw-r--r-- | 05-sleep_shift.patch | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/05-sleep_shift.patch b/05-sleep_shift.patch index 973cb8702207..1e029188c3b1 100644 --- a/05-sleep_shift.patch +++ b/05-sleep_shift.patch @@ -1,23 +1,5 @@ -From 6d92ce5e4248eec87c831734bff72581721a1026 Mon Sep 17 00:00:00 2001 -From: Colin Watson <cjwatson@ubuntu.com> -Date: Mon, 13 Jan 2014 12:13:23 +0000 -Subject: Allow Shift to interrupt 'sleep --interruptible' - -Upstream would like to consider this at more length. See -http://lists.gnu.org/archive/html/grub-devel/2009-08/msg00718.html, and -the rest of the thread for context. - -Forwarded: http://lists.gnu.org/archive/html/grub-devel/2009-08/msg00694.html -Last-Update: 2013-12-04 - -Patch-Name: sleep_shift.patch ---- - grub-core/commands/sleep.c | 27 ++++++++++++++++++++++++++- - grub-core/normal/menu.c | 19 +++++++++++++++++++ - 2 files changed, 45 insertions(+), 1 deletion(-) - diff --git a/grub-core/commands/sleep.c b/grub-core/commands/sleep.c -index e77e7900f..3906b1410 100644 +index a1370b7..be9f386 100644 --- a/grub-core/commands/sleep.c +++ b/grub-core/commands/sleep.c @@ -46,6 +46,31 @@ do_print (int n) @@ -52,20 +34,11 @@ index e77e7900f..3906b1410 100644 /* Based on grub_millisleep() from kern/generic/millisleep.c. */ static int grub_interruptible_millisleep (grub_uint32_t ms) -@@ -55,7 +80,7 @@ grub_interruptible_millisleep (grub_uint32_t ms) - start = grub_get_time_ms (); - - while (grub_get_time_ms () - start < ms) -- if (grub_getkey_noblock () == GRUB_TERM_ESC) -+ if (grub_check_keyboard ()) - return 1; - - return 0; diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index 719e2fb1c..9d0ad4c95 100644 +index 8397886..c2943c6 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c -@@ -615,8 +615,27 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot) +@@ -614,8 +614,27 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot) saved_time = grub_get_time_ms (); while (1) { |