diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2012-10-05 11:20:56 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2012-10-05 11:20:56 -0700 |
| commit | 5ea013bd8112dc1c2536ff5ccd8ee41f012ff8c0 (patch) | |
| tree | c4c2f2fac4b5af8888fee98369bb42592b2c14ba /debian | |
| parent | be30a8502c24089efd92d22f5b629836d4498a27 (diff) | |
| download | efi-boot-shim-5ea013bd8112dc1c2536ff5ccd8ee41f012ff8c0.tar.gz efi-boot-shim-5ea013bd8112dc1c2536ff5ccd8ee41f012ff8c0.zip | |
debian/patches/second-stage-path: Chainload grubx64.efi, not
grub.efi.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/second-stage-path | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 69334d65..1014638f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +shim (0~20120906.bcd0a4e8-0ubuntu3) UNRELEASED; urgency=low + + * debian/patches/second-stage-path: Chainload grubx64.efi, not + grub.efi. + + -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 05 Oct 2012 11:20:34 -0700 + shim (0~20120906.bcd0a4e8-0ubuntu2) quantal; urgency=low * debian/patches/prototypes: Include missing prototypes, and disable diff --git a/debian/patches/second-stage-path b/debian/patches/second-stage-path new file mode 100644 index 00000000..1b5db5e0 --- /dev/null +++ b/debian/patches/second-stage-path @@ -0,0 +1,18 @@ +Description: Chainload grubx64.efi, not grub.efi + We qualify the second stage bootloader image with the architecture name, + so we're forwards-compatible with any future 32-bit implementations. + (Non-SB grub doesn't conflict, since the image will be named bootia32.efi + anyway, not grub.efi.) +Author: Steve Langasek <steve.langasek@ubuntu.com> + +--- shim-0~20120906.bcd0a4e8.orig/shim.c ++++ shim-0~20120906.bcd0a4e8/shim.c +@@ -40,7 +40,7 @@ + #include "shim.h" + #include "signature.h" + +-#define SECOND_STAGE L"\\grub.efi" ++#define SECOND_STAGE L"\\grubx64.efi" + + static EFI_SYSTEM_TABLE *systab; + static EFI_STATUS (EFIAPI *entry_point) (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table); diff --git a/debian/patches/series b/debian/patches/series index feaa6294..42f8afa0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ prototypes +second-stage-path |