diff options
| author | Stéphane Graber <stgraber@ubuntu.com> | 2013-08-08 17:12:06 +0200 |
|---|---|---|
| committer | Stéphane Graber <stgraber@ubuntu.com> | 2013-08-08 17:12:06 +0200 |
| commit | 0929c5e5f5648e2e602c19f20915a4ed504babcb (patch) | |
| tree | f2ff6540bf9d1c8c886ac809f139a7a123c69292 /debian | |
| parent | 44ecc6a350e738a0a8bcd727b3990ce9dadd527f (diff) | |
| download | efi-boot-shim-0929c5e5f5648e2e602c19f20915a4ed504babcb.tar.gz efi-boot-shim-0929c5e5f5648e2e602c19f20915a4ed504babcb.zip | |
Fix for LP: #1087501
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/no-print-on-unsigned | 19 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 1969c7e8..54e995f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ shim (0.4-0ubuntu3) UNRELEASED; urgency=low + [ Steve Langasek ] * Install MokManager.efi.signed in the package. * debian/patches/no-output-by-default.patch: Don't print any informational messages. Closes LP: #1074302. + [ Stéphane Graber ] + * debian/patches/no-print-on-unsigned: Don't print an error message when + validating an unsigned binary as that tends to hang Lenovo machines. + (LP: #1087501) + -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 03 Jul 2013 12:02:12 -0700 shim (0.4-0ubuntu2) saucy; urgency=low diff --git a/debian/patches/no-print-on-unsigned b/debian/patches/no-print-on-unsigned new file mode 100644 index 00000000..6dcc0977 --- /dev/null +++ b/debian/patches/no-print-on-unsigned @@ -0,0 +1,19 @@ +Description: Don't print any message when validating an unsigned binary + Printing the error message when validating an unsigned binary was causing + the boot to hang on Lenovo machines, possibly because of a broken Print() + implementation in those firmware (or some interaction with grub). +Author: Stéphane Graber <stgraber@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1087501 + +Index: shim-clean/shim.c +=================================================================== +--- shim-clean.orig/shim.c 2013-08-08 16:19:11.886403060 +0200 ++++ shim-clean/shim.c 2013-08-08 16:20:09.590405204 +0200 +@@ -652,7 +652,6 @@ + unsigned int size = datasize; + + if (context->SecDir->Size == 0) { +- Print(L"Empty security header\n"); + return EFI_INVALID_PARAMETER; + } + diff --git a/debian/patches/series b/debian/patches/series index 39007dbb..c07f3b5c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ prototypes second-stage-path sbsigntool-not-pesign no-output-by-default.patch +no-print-on-unsigned |