← Back to branch summary

~ubuntu-core-dev/ubuntu/natty/grub2/natty

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_x86_64_efi.patch

  • Committer: Colin Watson
  • Date: 2011-04-21 11:15:59 UTC
  • Revision ID: cjwatson@canonical.com-20110421111559-gkr4ow1j0bxm0i7w
* Cherry-pick from upstream:
  - Fix grub-install on amd64 EFI systems.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_x86_64_efi.patch
 
1
Description: Fix grub-install on amd64 EFI systems
 
2
Author: Vladimir Serbinenko <phcoder@gmail.com>
 
3
Bug-Debian: http://bugs.debian.org/617388
 
4
Forwarded: yes
 
5
Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/3097
 
6
Last-Update: 2011-04-21
 
7
 
 
8
Index: b/util/grub-install.in
 
9
===================================================================
 
10
--- a/util/grub-install.in
 
11
+++ b/util/grub-install.in
 
12
@@ -354,7 +354,7 @@
 
13
            case "$target_cpu" in
 
14
                i386)
 
15
                    efi_file=BOOTIA32.EFI ;;
 
16
-               x86-64)
 
17
+               x86_64)
 
18
                    efi_file=BOOTX64.EFI ;;
 
19
            # GRUB does not yet support these architectures, but they're defined
 
20
            # by the specification so we include them here to ease future
 
21
@@ -368,7 +368,7 @@
 
22
            case "$target_cpu" in
 
23
                i386)
 
24
                    efi_file=grubia32.efi ;;
 
25
-               x86-64)
 
26
+               x86_64)
 
27
                    efi_file=grubx64.efi ;;
 
28
         # GRUB does not yet support these architectures, but they're defined
 
29
         # by the specification so we include them here to ease future