← Back to branch summary

~madengineer10/ubuntu/trusty/grub/linux-pref-substr

« back to all changes in this revision

Viewing changes to debian/patches/maybe_quiet.patch

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2014-03-10 13:39:33 UTC
  • mfrom: (17.3.92 sid)
  • Revision ID: package-import@ubuntu.com-20140310133933-g8xl9ebq5360deqm
Tags: 2.02~beta2-7
https://launchpad.net/bugs/843804
* Fix shift-held-down test not to clear other modifier key states
  (LP: #843804).
* Explicitly pass an appropriate --target to grub-install in the postinst
  (suggested by Jordan Uggla).
* Backport from upstream:
  - Use bootaa64.efi instead of bootaarch64.efi on arm64 to comply with
    EFI specification.  Also use grubaa64.efi for consistency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/maybe_quiet.patch
1
 
From a22ef2bbf3232bc9b1982fc9fee92a7f56b5cd7c Mon Sep 17 00:00:00 2001
 
1
From 8d5c3fdf7090909163cead91efd7f760bfebd65b Mon Sep 17 00:00:00 2001
2
2
From: Colin Watson <cjwatson@ubuntu.com>
3
3
Date: Mon, 13 Jan 2014 12:13:26 +0000
4
4
Subject: Add configure option to reduce visual clutter at boot time
29
29
Bug-Ubuntu: https://bugs.launchpad.net/bugs/386922
30
30
Bug-Ubuntu: https://bugs.launchpad.net/bugs/861048
31
31
Forwarded: (partial) http://lists.gnu.org/archive/html/grub-devel/2009-09/msg00056.html
32
 
Last-Update: 2013-12-25
 
32
Last-Update: 2014-01-03
33
33
 
34
34
Patch-Name: maybe_quiet.patch
35
35
---
91
91
 echo "*******************************************************"
92
92
 ]
93
93
diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
94
 
index b4975e2..1fc8f08 100644
 
94
index b4975e2..7ebd96b 100644
95
95
--- a/grub-core/boot/i386/pc/boot.S
96
96
+++ b/grub-core/boot/i386/pc/boot.S
97
97
@@ -19,6 +19,9 @@
111
111
+#if defined(QUIET_BOOT) && !defined(HYBRID_BOOT)
112
112
+       /* is either shift key held down? */
113
113
+       movw    $(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
114
 
+       andb    $3, (%bx)
 
114
+       testb   $3, (%bx)
115
115
+       jz      2f
116
116
+#endif
117
117
+
123
123
        movw    $disk_address_packet, %si
124
124
 
125
125
diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
126
 
index d030a14..7d0741a 100644
 
126
index d030a14..7534991 100644
127
127
--- a/grub-core/boot/i386/pc/diskboot.S
128
128
+++ b/grub-core/boot/i386/pc/diskboot.S
129
129
@@ -18,6 +18,9 @@
195
195
+LOCAL(check_silent):
196
196
+       /* is either shift key held down? */
197
197
+       movw    $(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
198
 
+       andb    $3, (%bx)
 
198
+       testb   $3, (%bx)
199
199
+       ret
200
200
+#endif
201
201
+