← Back to branch summary

~ubuntu-branches/ubuntu/vivid/grub2/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/grub-xen-host_grub.cfg

  • Committer: Package Import Robot
  • Author(s): Ian Campbell, Colin Watson, Ian Campbell
  • Date: 2014-11-30 17:15:21 UTC
  • Revision ID: package-import@ubuntu.com-20141130171521-jtqle9j0ckcww9wy
Tags: 2.02~beta2-17
https://launchpad.net/bugs/1390766
http://bugs.debian.org/770412
http://bugs.debian.org/755256
[ Colin Watson ]
* Fix up some pointer-to-integer casts in linuxefi so that it can build on
  i386-efi.
* Backport from upstream:
  - Fix typo (gettext_print instead of gettext_printf) (LP: #1390766).

[ Ian Campbell ]
* Correct syntax error in grub-xen-host bootstrap configuration file.
* Log failure when grub-install fails in postinst, rather than failing the
  entire postinst. (Closes: #770412)
* Arrange to insmod xzio and lzopio when booting a kernel as a Xen guest.
  (Closes: #755256)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/grub-xen-host_grub.cfg
1
1
# First search for a suitable grub to chainload
2
2
if search -s -f /boot/xen/pvboot-@@PVBOOT_ARCH@@.elf ; then
3
3
        echo "Chainloading (${root})/boot/xen/pvboot-@@PVBOOT_ARCH@@.elf"
4
 
        multiboot /boot/xen/pvboot-@@PVBOOT_ARCH@@.elf"
 
4
        multiboot "/boot/xen/pvboot-@@PVBOOT_ARCH@@.elf"
5
5
        boot
6
6
fi
7
7
 
8
8
if search -s -f /xen/pvboot-@@PVBOOT_ARCH@@.elf ; then
9
9
        echo "Chainloading (${root})/xen/pvboot-@@PVBOOT_ARCH@@.elf"
10
 
        multiboot /xen/pvboot-@@PVBOOT_ARCH@@.elf"
 
10
        multiboot "/xen/pvboot-@@PVBOOT_ARCH@@.elf"
11
11
        boot
12
12
fi
13
13