Merge lp:~vorlon/ubuntu/saucy/grub2/lp.1236625 into lp:~ubuntu-core-dev/ubuntu/raring/grub2/raring

[Steve Langasek]

This seems like the straightforward fix for bug #1236625, please let me know
if I've screwed it up somewhere :)

[lp:~vorlon/ubuntu/saucy/grub2/lp.1236625]

2356. By Steve Langasek on 2013-10-08

Rename patch, per Colin

2357. By Steve Langasek on 2013-10-10

rearrange the patch at Colin's request

2358. By Steve Langasek on 2013-10-10

Remove accidentally-included cruft from the patch

Unmerged revisions

2358. By Steve Langasek on 2013-10-10

Remove accidentally-included cruft from the patch

2357. By Steve Langasek on 2013-10-10

rearrange the patch at Colin's request

2356. By Steve Langasek on 2013-10-08

Rename patch, per Colin

2355. By Steve Langasek on 2013-10-07

debian/patches/efi_always_install_grub_cfg.patch: unconditionally
create grub.cfg on our EFI boot partition. Closes LP: #1236625.

2354. By Colin Watson on 2013-09-18

releasing package grub2 version 2.00-19ubuntu1

2353. By Colin Watson on 2013-09-18

merge from Debian 2.00-19

2352. By Colin Watson on 2013-09-18

* Backport from upstream:
  - Handle partitions on non-512B EFI disks (LP: #1065281).

2351. By Colin Watson on 2013-09-12

releasing package grub2 version 2.00-18ubuntu4

2350. By Colin Watson on 2013-09-12

Restore "-p /EFI/ubuntu" to the grub-mkimage call that creates
grubx64.efi, to fix the case of booting from a hard disk with Secure
Boot enabled.

2349. By Colin Watson on 2013-09-11

releasing package grub2 version 2.00-18ubuntu3

=== modified file 'Makefile.util.def'
--- Makefile.util.def	2013-02-01 17:45:21 +0000
+++ Makefile.util.def	2013-10-08 00:15:07 +0000
@@ -701,6 +701,12 @@
 
 script = {
   testcase;
+  name = grub_script_no_commands;
+  common = tests/grub_script_no_commands.in;
+};
+
+script = {
+  testcase;
   name = partmap_test;
   common = tests/partmap_test.in;
 };

=== modified file 'config.h.in'
--- config.h.in	2012-02-04 20:47:29 +0000
+++ config.h.in	2013-10-08 00:15:07 +0000
@@ -41,6 +41,8 @@
 #define NEED_REGISTER_FRAME_INFO @NEED_REGISTER_FRAME_INFO@
 /* Define to 1 to enable disk cache statistics.  */
 #define DISK_CACHE_STATS @DISK_CACHE_STATS@
+/* Define to 1 to make GRUB quieter at boot time.  */
+#define QUIET_BOOT @QUIET_BOOT@
 
 #define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
 #define GRUB_PLATFORM "@GRUB_PLATFORM@"

=== modified file 'configure.ac'
--- configure.ac	2012-09-04 17:12:59 +0000
+++ configure.ac	2013-10-08 00:15:07 +0000
@@ -1076,6 +1076,17 @@
 AC_SUBST([LIBZFS])
 AC_SUBST([LIBNVPAIR])
 
+AC_ARG_ENABLE([quiet-boot],
+              [AS_HELP_STRING([--enable-quiet-boot],
+                              [emit fewer messages at boot time (default=no)])],
+              [], [enable_quiet_boot=no])
+if test x"$enable_quiet_boot" = xyes ; then
+  QUIET_BOOT=1
+else
+  QUIET_BOOT=0
+fi
+AC_SUBST([QUIET_BOOT])
+
 LIBS=""
 
 AC_SUBST([FONT_SOURCE])
@@ -1232,5 +1243,10 @@
 else
 echo With libzfs support: No "($libzfs_excuse)"
 fi
+if [ x"$enable_quiet_boot" = xyes ]; then
+echo With quiet boot: Yes
+else
+echo With quiet boot: No
+fi
 echo "*******************************************************"
 ]

=== renamed file 'debian/presubj' => 'debian/bug-presubj'
=== renamed file 'debian/script' => 'debian/bug-script'
--- debian/script	2011-03-28 22:49:42 +0000
+++ debian/bug-script	2013-10-08 00:15:07 +0000
@@ -44,7 +44,7 @@
 if [ "$REPLY" = yep ]; then
   echo >&3
   echo "*********************** BEGIN LVM" >&3
-  su root -c "vgdisplay; pvdisplay; lvdisplay" >&3
+  su root -c "vgdisplay; pvdisplay; lvdisplay" >&3 || true
   echo "*********************** END LVM" >&3
 fi
 

=== modified file 'debian/build-efi-images'
--- debian/build-efi-images	2013-02-01 17:45:21 +0000
+++ debian/build-efi-images	2013-10-08 00:15:07 +0000
@@ -47,10 +47,20 @@
 
 # Skeleton configuration file which finds the real boot disk.
 cat >"$workdir/grub.cfg" <<EOF
-if ! search --file --set=root /.disk/info; then
-	search --file --set=root /.disk/mini-info
-fi
-set prefix=(\$root)/boot/grub
+if [ -z "\$prefix" -o ! -e "\$prefix" ]; then
+	if ! search --file --set=root /.disk/info; then
+		search --file --set=root /.disk/mini-info
+	fi
+	set prefix=(\$root)/boot/grub
+fi
+if [ -e \$prefix/$platform/grub.cfg ]; then
+	source \$prefix/$platform/grub.cfg
+else
+	source \$prefix/grub.cfg
+fi
+EOF
+
+cat >"$workdir/grub-netboot.cfg" <<EOF
 if [ -e \$prefix/$platform/grub.cfg ]; then
 	source \$prefix/$platform/grub.cfg
 else
@@ -61,20 +71,28 @@
 mkfs.msdos -C "$workdir/memdisk.fat" 64
 mcopy -i "$workdir/memdisk.fat" "$workdir/grub.cfg" ::grub.cfg
 
+mkfs.msdos -C "$workdir/memdisk-netboot.fat" 64
+mcopy -i "$workdir/memdisk-netboot.fat" "$workdir/grub-netboot.cfg" ::grub.cfg
+
 CD_MODULES="
 	all_video boot btrfs cat chain configfile echo efifwsetup
-	efinet ext2 fat font gfxmenu gfxterm gzio halt hfsplus
+	efinet ext2 fat font gettext gfxmenu gfxterm gzio halt hfsplus
 	iso9660 jpeg keystatus loadenv linux linuxefi memdisk minicmd
 	normal part_apple part_msdos part_gpt password_pbkdf2 png
 	reboot search search_fs_uuid search_fs_file search_label sleep
 	test video"
 GRUB_MODULES="$CD_MODULES lvm mdraid09 mdraid1x"
+NET_MODULES="$CD_MODULES tftp"
 
 "$grub_mkimage" -O "$platform" -o "$outdir/gcd$efi_name.efi" \
-	-d "$grub_core" -p /EFI/BOOT \
+	-d "$grub_core" \
 	-c "$workdir/grub-bootstrap.cfg" -m "$workdir/memdisk.fat" \
+	-p /boot/grub \
 	$CD_MODULES
 "$grub_mkimage" -O "$platform" -o "$outdir/grub$efi_name.efi" \
 	-d "$grub_core" -p /EFI/ubuntu $GRUB_MODULES
+"$grub_mkimage" -O "$platform" -o "$outdir/grubnet$efi_name.efi" \
+	-d "$grub_core" -c "$workdir/grub-bootstrap.cfg" \
+	-m "$workdir/memdisk-netboot.fat" -p /grub $NET_MODULES
 
 exit 0

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-09 09:14:57 +0000
+++ debian/changelog	2013-10-08 00:15:07 +0000
@@ -1,3 +1,244 @@
+grub2 (2.00-19ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/efi_always_install_grub_cfg.patch: unconditionally
+    create grub.cfg on our EFI boot partition.  Closes LP: #1236625.
+
+ -- Steve Langasek <[e-mail]>  Mon, 07 Oct 2013 16:55:32 -0700
+
+grub2 (2.00-19ubuntu1) saucy; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Default to hiding the menu; holding down Shift at boot will show it.
+    - Add crashkernel option.
+    - Bypass menu unless other OSes are installed or Shift is pressed.
+    - Show the boot menu if the previous boot failed.
+    - Check hardware support before using gfxpayload=keep.
+    - Set vt.handoff=7 for smooth handoff to kernel graphical mode.
+    - In recovery mode, add nomodeset to the Linux kernel arguments, and
+      remove the 'set gfxpayload=keep' command.
+    - Handle probing striped DM-RAID devices.
+
+ -- Colin Watson <[e-mail]>  Wed, 18 Sep 2013 21:20:28 +0100
+
+grub2 (2.00-19) unstable; urgency=low
+
+  [ Colin Watson ]
+  * Merge from Ubuntu:
+    - debian/build-efi-images: Where possible, make use of the device path
+      derived from the EFI Loaded Image Protocol to compute the prefix
+      (LP: #1097570).
+    - debian/build-efi-images: Add a netboot image target to our set of
+      prebuilt EFI images (thanks, Steve Langasek).
+  * Backport from upstream:
+    - Handle partitions on non-512B EFI disks (LP: #1065281).
+
+  [ Phillip Susi ]
+  * restore_mkdevicemap.patch: Fix dmraid uuid check to look for "DMRAID-"
+    anywhere instead of only at the start, since kpartx prefixes it with
+    "partN-" (LP: #1183915).
+
+ -- Colin Watson <[e-mail]>  Wed, 18 Sep 2013 17:18:27 +0100
+
+grub2 (2.00-18ubuntu4) saucy; urgency=low
+
+  * Restore "-p /EFI/ubuntu" to the grub-mkimage call that creates
+    grubx64.efi, to fix the case of booting from a hard disk with Secure
+    Boot enabled.
+
+ -- Colin Watson <[e-mail]>  Thu, 12 Sep 2013 15:27:32 +0100
+
+grub2 (2.00-18ubuntu3) saucy; urgency=low
+
+  * Fix recordfail-disabling patch to take account of the GRUB_PREFIX
+    variable no longer existing.
+
+ -- Colin Watson <[e-mail]>  Wed, 11 Sep 2013 17:41:22 +0100
+
+grub2 (2.00-18ubuntu2) saucy; urgency=low
+
+  [ Colin Watson ]
+  * debian/build-efi-images: Where possible, make use of the device path
+    derived from the EFI Loaded Image Protocol to compute the prefix
+    (LP: #1097570).
+
+  [ Steve Langasek ]
+  * debian/build-efi-images: Add a netboot image target to our set of
+    prebuilt EFI images.
+
+  [ Richard Laager ]
+  * Disable the use of recordfail for filesystems to which GRUB cannot write
+    (LP: #913336).
+
+ -- Colin Watson <[e-mail]>  Wed, 11 Sep 2013 14:58:41 +0100
+
+grub2 (2.00-18ubuntu1) saucy; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Default to hiding the menu; holding down Shift at boot will show it.
+    - Add crashkernel option.
+    - Bypass menu unless other OSes are installed or Shift is pressed.
+    - Show the boot menu if the previous boot failed.
+    - Check hardware support before using gfxpayload=keep.
+    - Set vt.handoff=7 for smooth handoff to kernel graphical mode.
+    - In recovery mode, add nomodeset to the Linux kernel arguments, and
+      remove the 'set gfxpayload=keep' command.
+    - Handle probing striped DM-RAID devices.
+
+ -- Colin Watson <[e-mail]>  Mon, 26 Aug 2013 21:59:39 +0200
+
+grub2 (2.00-18) unstable; urgency=low
+
+  * Add gettext module to signed UEFI images (LP: #1104627).
+  * Put the preprocessor definition for quiet-boot in the right place so
+    that it actually takes effect.
+
+ -- Colin Watson <[e-mail]>  Mon, 26 Aug 2013 17:23:09 +0100
+
+grub2 (2.00-17ubuntu1) saucy; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Default to hiding the menu; holding down Shift at boot will show it.
+    - Add crashkernel option.
+    - Bypass menu unless other OSes are installed or Shift is pressed.
+    - Show the boot menu if the previous boot failed.
+    - Check hardware support before using gfxpayload=keep.
+    - Set vt.handoff=7 for smooth handoff to kernel graphical mode.
+    - In recovery mode, add nomodeset to the Linux kernel arguments, and
+      remove the 'set gfxpayload=keep' command.
+    - Handle probing striped DM-RAID devices.
+
+ -- Colin Watson <[e-mail]>  Thu, 15 Aug 2013 11:40:37 +0200
+
+grub2 (2.00-17) unstable; urgency=low
+
+  * Really include patches to reduce visual clutter in normal mode when
+    building for Ubuntu.
+
+ -- Colin Watson <[e-mail]>  Thu, 15 Aug 2013 09:58:59 +0100
+
+grub2 (2.00-16) unstable; urgency=low
+
+  * Make reportbug script file robust against su authentication failures and
+    missing LVM commands.
+  * Backport from upstream:
+    - Move @itemize after @subsection to satisfy texinfo-5.1.
+    - grub-mkconfig: Fix detection of Emacs autosave files.
+    - Fix spurious failure on Xen partition devices without disk devices
+      (closes: #708614).
+  * Merge from Ubuntu:
+    - Treat Kubuntu as an alias for Ubuntu in GRUB_DISTRIBUTOR (Harald
+      Sitter).
+    - Make any EFI system boot into the shim (if installed) even if
+      SecureBoot is disabled (Stéphane Graber).
+    - Allow Shift to interrupt 'sleep --interruptible'.
+    - If building for Ubuntu:
+      + Reduce visual clutter in normal mode.
+      + Remove verbose messages printed before reading configuration.
+      + Suppress kernel/initrd progress messages, except in recovery mode.
+      + Suppress "GRUB loading" message unless Shift is held down.
+    - Skip Windows os-prober entries on Wubi systems.
+  * Consolidate debian/rules logic for when to build signed images.
+
+ -- Colin Watson <[e-mail]>  Thu, 15 Aug 2013 08:35:53 +0100
+
+grub2 (2.00-15ubuntu2) saucy; urgency=low
+
+  * Add ubuntu_shim_by_default.patch that makes any EFI system boot into
+    the shim (if installed) even if SecureBoot is disabled. (LP: #1184297)
+
+ -- Stéphane Graber <[e-mail]>  Thu, 18 Jul 2013 15:40:25 -0400
+
+grub2 (2.00-15ubuntu1) saucy; urgency=low
+
+  [ Colin Watson ]
+  * Resynchronise with Debian.  Remaining changes:
+    - Default to hiding the menu; holding down Shift at boot will show it.
+    - Add crashkernel option.
+    - Bypass menu unless other OSes are installed or Shift is pressed.
+    - Allow Shift to interrupt 'sleep --interruptible'.
+    - Reduce visual clutter in normal mode.
+    - Remove verbose messages printed before reading configuration.
+    - Suppress kernel/initrd progress messages, except in recovery mode.
+    - Show the boot menu if the previous boot failed.
+    - Suppress "GRUB loading" message unless Shift is held down.
+    - Check hardware support before using gfxpayload=keep.
+    - Set vt.handoff=7 for smooth handoff to kernel graphical mode.
+    - In recovery mode, add nomodeset to the Linux kernel arguments, and
+      remove the 'set gfxpayload=keep' command.
+    - Skip Windows os-prober entries on Wubi systems, and suppress the menu
+      by default if those are the only other-OS entries.
+    - Handle probing striped DM-RAID devices.
+    - Disable cursor as early as possible in grub_main.
+    - Treat Kubuntu as an alias for Ubuntu in GRUB_DISTRIBUTOR.
+
+  [ Harald Sitter ]
+  * Update mkconfig_ubuntu_distributor.patch to handle Kubuntu like Ubuntu;
+    no GNU/Linux suffix.
+
+ -- Colin Watson <[e-mail]>  Sat, 13 Jul 2013 17:08:01 +0100
+
+grub2 (2.00-15) unstable; urgency=low
+
+  [ Colin Watson ]
+  * Install reportbug presubj and script files in all binary packages.
+  * Make grub-yeeloong.postinst explicitly install with
+    --target=mipsel-loongson (closes: #708204).
+  * Make grub-script-check fail on scripts containing no commands (closes:
+    #713886).
+  * Make the description of grub-firmware-qemu a little more generic, rather
+    than assuming that bochsbios provides qemu's default BIOS image (closes:
+    #714277).
+  * Don't assume that the presence of /etc/default/grub or
+    /etc/default/grub.d/*.cfg means that any particular item is set in it
+    (LP: #1199731).
+
+  [ Debconf translations ]
+  * Hungarian (Dr. Nagy Elemér Károly).
+
+ -- Colin Watson <[e-mail]>  Sat, 13 Jul 2013 11:04:15 +0100
+
+grub2 (2.00-14ubuntu1) saucy; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Default to hiding the menu; holding down Shift at boot will show it.
+    - Add crashkernel option.
+    - Bypass menu unless other OSes are installed or Shift is pressed.
+    - Allow Shift to interrupt 'sleep --interruptible'.
+    - Reduce visual clutter in normal mode.
+    - Remove verbose messages printed before reading configuration.
+    - Suppress kernel/initrd progress messages, except in recovery mode.
+    - Show the boot menu if the previous boot failed.
+    - Suppress "GRUB loading" message unless Shift is held down.
+    - Check hardware support before using gfxpayload=keep.
+    - Set vt.handoff=7 for smooth handoff to kernel graphical mode.
+    - In recovery mode, add nomodeset to the Linux kernel arguments, and
+      remove the 'set gfxpayload=keep' command.
+    - Skip Windows os-prober entries on Wubi systems, and suppress the menu
+      by default if those are the only other-OS entries.
+    - Handle probing striped DM-RAID devices.
+    - Disable cursor as early as possible in grub_main.
+    - Treat Kubuntu as an alias for Ubuntu in GRUB_DISTRIBUTOR.
+
+ -- Colin Watson <[e-mail]>  Thu, 09 May 2013 11:38:58 +0100
+
+grub2 (2.00-14) unstable; urgency=low
+
+  * Merge from Ubuntu:
+    - Don't call update-grub in the zz-update-grub kernel hook if
+      /boot/grub/grub.cfg doesn't exist.
+    - acpihalt: expand parser to handle SSDTs and some more opcodes.  Fixes
+      test suite hang with current seabios.
+  * Remove kernel-specific grub.d conffiles that were dropped from packages
+    built for all but their corresponding kernel type in 1.96+20090307-1
+    (closes: #703539).
+  * Look for grub-bios-setup in /usr/lib/grub/i386-pc/ as well (closes:
+    #705636).
+  * Merge 1.99-27.1 (thanks, Steve McIntyre):
+    - Add entries for Windows Boot Manager found via UEFI in os-prober
+      (closes: #698914).
+
+ -- Colin Watson <[e-mail]>  Thu, 09 May 2013 00:14:55 +0100
+
 grub2 (2.00-13ubuntu3) raring; urgency=low
 
   * In 05_debian_theme treat 'Kubuntu' as Ubuntu alias in $GRUB_DISTRIBUTOR.
@@ -701,6 +942,14 @@
 
  -- Colin Watson <[e-mail]>  Thu, 06 Sep 2012 19:04:21 +0100
 
+grub2 (1.99-27.1) unstable; urgency=medium
+
+  * NMU
+  * Add entries for Windows Boot Manager found via UEFI in
+    os-prober. Closes: #698914 before the Wheezy release.
+
+ -- Steve McIntyre <[e-mail]>  Fri, 26 Apr 2013 23:53:34 +0100
+
 grub2 (1.99-27) unstable; urgency=low
 
   * Amend gfxpayload_keep_default.patch to no longer remove the call to

=== modified file 'debian/config.in'
--- debian/config.in	2013-01-21 13:18:16 +0000
+++ debian/config.in	2013-10-08 00:15:07 +0000
@@ -47,13 +47,14 @@
 
 for x in /etc/default/grub /etc/default/grub.d/*.cfg ; do
   if [ -e "$x" ]; then
-    DEFAULT_FOUND="yes"
     . "$x"
   fi
 done
 
-if [ "$DEFAULT_FOUND" = "yes" ]; then
+if [ "${GRUB_CMDLINE_LINUX+set}" = set ]; then
   db_set grub2/linux_cmdline "$GRUB_CMDLINE_LINUX"
+fi
+if [ "${GRUB_CMDLINE_LINUX_DEFAULT+set}" = set ]; then
   db_set grub2/linux_cmdline_default "$GRUB_CMDLINE_LINUX_DEFAULT"
 
   case @PACKAGE@ in

=== modified file 'debian/control'
--- debian/control	2013-02-01 17:45:21 +0000
+++ debian/control	2013-10-08 00:15:07 +0000
@@ -42,7 +42,7 @@
 Homepage: http://www.gnu.org/software/grub/
 XS-Debian-Vcs-Bzr: http://anonscm.debian.org/bzr/pkg-grub/trunk/grub/
 XS-Debian-Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-grub/trunk/grub/
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu/raring/grub2/raring
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu/saucy/grub2/saucy
 
 Package: grub2
 Section: oldlibs
@@ -439,8 +439,8 @@
 Multi-Arch: foreign
 Description: GRUB firmware image for QEMU
  This package contains a binary of GRUB that has been built for use as
- firmware for QEMU.  It can be used as a replacement for the standard
- PC BIOS provided by the bochsbios package (bios.bin).
+ firmware for QEMU.  It can be used as a replacement for other PC BIOS
+ images provided by seabios, bochsbios, and so on.
  .
  In order to make QEMU use this firmware, simply add `-bios grub.bin' when
  invoking it.

=== modified file 'debian/dirs.in'
--- debian/dirs.in	2009-08-30 11:51:21 +0000
+++ debian/dirs.in	2013-10-08 00:15:07 +0000
@@ -1,4 +1,3 @@
 usr/bin
 usr/sbin
 usr/share/grub
-usr/share/bug/@PACKAGE@

=== modified file 'debian/grub-common.install.in'
--- debian/grub-common.install.in	2012-09-14 13:57:40 +0000
+++ debian/grub-common.install.in	2013-10-08 00:15:07 +0000
@@ -1,4 +1,3 @@
-../../debian/presubj			usr/share/bug/grub-common
 ../../debian/apport/source_grub2.py	usr/share/apport/package-hooks/
 ../../debian/grub.d			etc
 

=== added file 'debian/grub-common.maintscript.hurd.in'
--- debian/grub-common.maintscript.hurd.in	1970-01-01 00:00:00 +0000
+++ debian/grub-common.maintscript.hurd.in	2013-10-08 00:15:07 +0000
@@ -0,0 +1,3 @@
+# Removed in 1.96+20090307-1.
+rm_conffile /etc/grub.d/10_freebsd 2.00-14~
+rm_conffile /etc/grub.d/10_linux 2.00-14~

=== added file 'debian/grub-common.maintscript.kfreebsd.in'
--- debian/grub-common.maintscript.kfreebsd.in	1970-01-01 00:00:00 +0000
+++ debian/grub-common.maintscript.kfreebsd.in	2013-10-08 00:15:07 +0000
@@ -0,0 +1,3 @@
+# Removed in 1.96+20090307-1.
+rm_conffile /etc/grub.d/10_hurd 2.00-14~
+rm_conffile /etc/grub.d/10_linux 2.00-14~

=== added file 'debian/grub-common.maintscript.linux.in'
--- debian/grub-common.maintscript.linux.in	1970-01-01 00:00:00 +0000
+++ debian/grub-common.maintscript.linux.in	2013-10-08 00:15:07 +0000
@@ -0,0 +1,3 @@
+# Removed in 1.96+20090307-1.
+rm_conffile /etc/grub.d/10_freebsd 2.00-14~
+rm_conffile /etc/grub.d/10_hurd 2.00-14~

=== modified file 'debian/grub.d/05_debian_theme'
--- debian/grub.d/05_debian_theme	2013-04-09 09:14:57 +0000
+++ debian/grub.d/05_debian_theme	2013-10-08 00:15:07 +0000
@@ -28,19 +28,22 @@
 BACKGROUND_CACHE=".background_cache"
 
 set_default_theme(){
-	if [ "$GRUB_DISTRIBUTOR" = Ubuntu ] || [ "$GRUB_DISTRIBUTOR" = Kubuntu ]; then
-		# Set a monochromatic theme for Ubuntu.
-		echo "${1}set menu_color_normal=white/black"
-		echo "${1}set menu_color_highlight=black/light-gray"
+	case $GRUB_DISTRIBUTOR in
+		Ubuntu|Kubuntu)
+			# Set a monochromatic theme for Ubuntu.
+			echo "${1}set menu_color_normal=white/black"
+			echo "${1}set menu_color_highlight=black/light-gray"
 
-		if [ -e /lib/plymouth/themes/default.grub ]; then
-			sed "s/^/${1}/" /lib/plymouth/themes/default.grub
-		fi
-	else
-		# Set the traditional Debian blue theme.
-		echo "${1}set menu_color_normal=cyan/blue"
-		echo "${1}set menu_color_highlight=white/blue"
-	fi
+			if [ -e /lib/plymouth/themes/default.grub ]; then
+				sed "s/^/${1}/" /lib/plymouth/themes/default.grub
+			fi
+			;;
+		*)
+			# Set the traditional Debian blue theme.
+			echo "${1}set menu_color_normal=cyan/blue"
+			echo "${1}set menu_color_highlight=white/blue"
+			;;
+	esac
 }
 
 module_available(){
@@ -170,10 +173,15 @@
 fi
 
 # If we haven't found a background image yet, use the default from desktop-base.
-if [ "$GRUB_DISTRIBUTOR" != Ubuntu ] && [ "$GRUB_DISTRIBUTOR" != Kubuntu ] && \
-   set_background_image "/usr/share/images/desktop-base/desktop-grub.png"; then
-	exit 0
-fi
+case $GRUB_DISTRIBUTOR in
+	Ubuntu|Kubuntu)
+		;;
+	*)
+		if set_background_image "/usr/share/images/desktop-base/desktop-grub.png"; then
+			exit 0
+		fi
+		;;
+esac
 
 # Finally, if all of the above fails, use the default theme.
 set_default_theme

=== removed file 'debian/grub2.dirs'
--- debian/grub2.dirs	2007-05-15 19:52:26 +0000
+++ debian/grub2.dirs	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/bug/grub2

=== removed file 'debian/grub2.install'
--- debian/grub2.install	2007-05-15 19:52:26 +0000
+++ debian/grub2.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-debian/presubj		usr/share/bug/grub2
-debian/script		usr/share/bug/grub2

=== modified file 'debian/install-bin.in'
--- debian/install-bin.in	2012-09-14 10:59:14 +0000
+++ debian/install-bin.in	2013-10-08 00:15:07 +0000
@@ -1,6 +1,3 @@
-../../debian/presubj			usr/share/bug/@PACKAGE@
-../../debian/script			usr/share/bug/@PACKAGE@
-
 usr/lib/grub/@CPU_PLATFORM@/*.img
 usr/lib/grub/@CPU_PLATFORM@/*.lst
 usr/lib/grub/@CPU_PLATFORM@/*.mod

=== modified file 'debian/install.in'
--- debian/install.in	2012-09-14 10:59:14 +0000
+++ debian/install.in	2013-10-08 00:15:07 +0000
@@ -1,4 +1,2 @@
-../../debian/presubj			usr/share/bug/@PACKAGE@
-../../debian/script			usr/share/bug/@PACKAGE@
 ../../debian/kernel/zz-update-grub	etc/kernel/postinst.d
 ../../debian/kernel/zz-update-grub	etc/kernel/postrm.d

=== added file 'debian/patches/acpihalt_improvements.patch'
--- debian/patches/acpihalt_improvements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/acpihalt_improvements.patch	2013-10-08 00:15:07 +0000
@@ -0,0 +1,191 @@
+Description: acpihalt: expand parser to handle SSDTs and some more opcodes
+Author: Colin Watson <[e-mail]>
+Forwarded: https://lists.gnu.org/archive/html/grub-devel/2013-03/msg00060.html
+Last-Update: 2013-05-09
+
+Index: b/grub-core/commands/acpihalt.c
+===================================================================
+--- a/grub-core/commands/acpihalt.c
++++ b/grub-core/commands/acpihalt.c
+@@ -41,6 +41,7 @@
+ #endif
+ 
+ #ifndef GRUB_DSDT_TEST
++#include <grub/mm.h>
+ #include <grub/misc.h>
+ #include <grub/time.h>
+ #include <grub/cpu/io.h>
+@@ -146,6 +147,10 @@
+       ptr += skip_name_string (ptr, end);
+       ptr++;
+       break;
++    case GRUB_ACPI_EXTOPCODE_EVENT_OP:
++      ptr++;
++      ptr += skip_name_string (ptr, end);
++      break;
+     case GRUB_ACPI_EXTOPCODE_OPERATION_REGION:
+       ptr++;
+       ptr += skip_name_string (ptr, end);
+@@ -158,7 +163,12 @@
+ 	return 0;
+       break;
+     case GRUB_ACPI_EXTOPCODE_FIELD_OP:
++    case GRUB_ACPI_EXTOPCODE_DEVICE_OP:
++    case GRUB_ACPI_EXTOPCODE_PROCESSOR_OP:
++    case GRUB_ACPI_EXTOPCODE_POWER_RES_OP:
++    case GRUB_ACPI_EXTOPCODE_THERMAL_ZONE_OP:
+     case GRUB_ACPI_EXTOPCODE_INDEX_FIELD_OP:
++    case GRUB_ACPI_EXTOPCODE_BANK_FIELD_OP:
+       ptr++;
+       ptr += decode_length (ptr, 0);
+       break;
+@@ -170,12 +180,14 @@
+ }
+ 
+ static int
+-get_sleep_type (grub_uint8_t *table, grub_uint8_t *end)
++get_sleep_type (grub_uint8_t *table, grub_uint8_t *ptr, grub_uint8_t *end,
++		grub_uint8_t *scope, int scope_len)
+ {
+-  grub_uint8_t *ptr, *prev = table;
+-  int sleep_type = -1;
++  grub_uint8_t *prev = table;
++  int sleep_type = -2;
+   
+-  ptr = table + sizeof (struct grub_acpi_table_header);
++  if (!ptr)
++    ptr = table + sizeof (struct grub_acpi_table_header);
+   while (ptr < end && prev < ptr)
+     {
+       int add;
+@@ -202,7 +214,8 @@
+ 	  }
+ 	case GRUB_ACPI_OPCODE_NAME:
+ 	  ptr++;
+-	  if (memcmp (ptr, "_S5_", 4) == 0 || memcmp (ptr, "\\_S5_", 4) == 0)
++	  if ((!scope || memcmp (scope, "\\", scope_len) == 0) &&
++	      (memcmp (ptr, "_S5_", 4) == 0 || memcmp (ptr, "\\_S5_", 4) == 0))
+ 	    {
+ 	      int ll;
+ 	      grub_uint8_t *ptr2 = ptr;
+@@ -241,6 +254,25 @@
+ 	    return -1;
+ 	  break;
+ 	case GRUB_ACPI_OPCODE_SCOPE:
++	  {
++	    int scope_sleep_type;
++	    int ll;
++	    grub_uint8_t *name;
++	    int name_len;
++
++	    ptr++;
++	    add = decode_length (ptr, &ll);
++	    name = ptr + ll;
++	    name_len = skip_name_string (name, ptr + add);
++	    if (!name_len)
++	      return -1;
++	    scope_sleep_type = get_sleep_type (table, name + name_len,
++					       ptr + add, name, name_len);
++	    if (scope_sleep_type != -2)
++	      return scope_sleep_type;
++	    ptr += add;
++	    break;
++	  }
+ 	case GRUB_ACPI_OPCODE_IF:
+ 	case GRUB_ACPI_OPCODE_METHOD:
+ 	  {
+@@ -291,7 +323,7 @@
+       return 2;
+     }
+ 
+-  printf ("Sleep type = %d\n", get_sleep_type (buf, buf + len));
++  printf ("Sleep type = %d\n", get_sleep_type (buf, NULL, buf + len, NULL, 0));
+   free (buf);
+   fclose (f);
+   return 0;
+@@ -304,8 +336,10 @@
+ {
+   struct grub_acpi_rsdp_v20 *rsdp2;
+   struct grub_acpi_rsdp_v10 *rsdp1;
+-      struct grub_acpi_table_header *rsdt;
+-      grub_uint32_t *entry_ptr;
++  struct grub_acpi_table_header *rsdt;
++  grub_uint32_t *entry_ptr;
++  grub_uint32_t port = 0;
++  int sleep_type = -1;
+ 
+   rsdp2 = grub_acpi_get_rsdpv2 ();
+   if (rsdp2)
+@@ -324,33 +358,39 @@
+     {
+       if (grub_memcmp ((void *) (grub_addr_t) *entry_ptr, "FACP", 4) == 0)
+ 	{
+-	  grub_uint32_t port;
+ 	  struct grub_acpi_fadt *fadt
+ 	    = ((struct grub_acpi_fadt *) (grub_addr_t) *entry_ptr);
+ 	  struct grub_acpi_table_header *dsdt
+ 	    = (struct grub_acpi_table_header *) (grub_addr_t) fadt->dsdt_addr;
+-	  int sleep_type = -1;
++	  grub_uint8_t *buf = (grub_uint8_t *) dsdt;
+ 
+ 	  port = fadt->pm1a;
+ 
+ 	  grub_dprintf ("acpi", "PM1a port=%x\n", port);
+ 
+ 	  if (grub_memcmp (dsdt->signature, "DSDT",
+-			   sizeof (dsdt->signature)) != 0)
+-	    break;
++			   sizeof (dsdt->signature)) == 0)
++	    sleep_type = get_sleep_type (buf, NULL, buf + dsdt->length,
++					 NULL, 0);
++	}
++      else if (grub_memcmp ((void *) (grub_addr_t) *entry_ptr, "SSDT", 4) == 0)
++	{
++	  struct grub_acpi_table_header *ssdt
++	    = (struct grub_acpi_table_header *) (grub_addr_t) *entry_ptr;
++	  grub_uint8_t *buf = (grub_uint8_t *) ssdt;
+ 
+-	  sleep_type = get_sleep_type ((grub_uint8_t *) dsdt,
+-				       (grub_uint8_t *) dsdt + dsdt->length);
++	  grub_dprintf ("acpi", "SSDT = %p\n", ssdt);
+ 
+-	  if (sleep_type < 0 || sleep_type >= 8)
+-	    break;
++	  sleep_type = get_sleep_type (buf, NULL, buf + ssdt->length, NULL, 0);
++	}
++    }
+ 
+-	  grub_dprintf ("acpi", "SLP_TYP = %d, port = 0x%x\n",
+-			sleep_type, port);
++  if (port && sleep_type >= 0 && sleep_type < 8)
++    {
++      grub_dprintf ("acpi", "SLP_TYP = %d, port = 0x%x\n", sleep_type, port);
+ 
+-	  grub_outw (GRUB_ACPI_SLP_EN
+-	  	     | (sleep_type << GRUB_ACPI_SLP_TYP_OFFSET), port & 0xffff);
+-	}
++      grub_outw (GRUB_ACPI_SLP_EN | (sleep_type << GRUB_ACPI_SLP_TYP_OFFSET),
++		 port & 0xffff);
+     }
+ 
+   grub_millisleep (1500);
+Index: b/include/grub/acpi.h
+===================================================================
+--- a/include/grub/acpi.h
++++ b/include/grub/acpi.h
+@@ -174,9 +174,15 @@
+ enum
+   {
+     GRUB_ACPI_EXTOPCODE_MUTEX = 0x01,
++    GRUB_ACPI_EXTOPCODE_EVENT_OP = 0x02,
+     GRUB_ACPI_EXTOPCODE_OPERATION_REGION = 0x80,
+     GRUB_ACPI_EXTOPCODE_FIELD_OP = 0x81,
++    GRUB_ACPI_EXTOPCODE_DEVICE_OP = 0x82,
++    GRUB_ACPI_EXTOPCODE_PROCESSOR_OP = 0x83,
++    GRUB_ACPI_EXTOPCODE_POWER_RES_OP = 0x84,
++    GRUB_ACPI_EXTOPCODE_THERMAL_ZONE_OP = 0x85,
+     GRUB_ACPI_EXTOPCODE_INDEX_FIELD_OP = 0x86,
++    GRUB_ACPI_EXTOPCODE_BANK_FIELD_OP = 0x87,
+   };
+ 
+ #endif /* ! GRUB_ACPI_HEADER */

=== added file 'debian/patches/efi_always_install_grub_cfg.patch'
--- debian/patches/efi_always_install_grub_cfg.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/efi_always_install_grub_cfg.patch	2013-10-08 00:15:07 +0000
@@ -0,0 +1,36 @@
+Description: unconditionally create grub.cfg on our EFI boot partition
+ When grub is installed to the EFI partition with Secure Boot support, it
+ always needs some config to tell it the prefix to the /boot/grub disk,
+ because we aren't modifying the grub image at runtime to set the root.
+ So even though when using LVM we don't need to search for the root using
+ search.fs_uuid, we do need to use load.cfg to tell grub what that root
+ is.
+Author: Steve Langasek <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1236625
+Forwarded: no
+Last-Update: 2013-10-07
+
+Index: lp.1236625/util/grub-install.in
+===================================================================
+--- lp.1236625.orig/util/grub-install.in
++++ lp.1236625/util/grub-install.in
+@@ -848,10 +848,16 @@
+ 	else
+ 	    cp "$efi_signed" "${efidir}/${efi_file}"
+ 	fi
+-	if [ x"$config_opt_file" != x ]; then
+-	    cp "${config_opt_file}" "${efidir}/grub.cfg"
+-	    echo 'configfile $prefix/grub.cfg' >> "${efidir}/grub.cfg"
++	if [ x"$config_opt_file" = x ]; then
++	    # So we have a device abstraction; we don't need to search for
++	    # the root, but we do need to tell grub where it is.
++	    hints="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=efi_hints --device`"
++	    echo "set root=$hints" >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
++	    echo 'set prefix=($root)'"$(echo "${relative_grubdir}" | sed "s,\\([ \"'\\\\]\\),\\\\\\1,g")" >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
++	    config_opt_file="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
+ 	fi
++	cp "${config_opt_file}" "${efidir}/grub.cfg"
++	echo 'configfile $prefix/grub.cfg' >> "${efidir}/grub.cfg"
+     else
+ 	cp "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" "${efidir}/${efi_file}"
+ 	# For old macs. Suggested by Peter Jones.

=== added file 'debian/patches/efidisk_non_512_sectors.patch'
--- debian/patches/efidisk_non_512_sectors.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/efidisk_non_512_sectors.patch	2013-10-08 00:15:07 +0000
@@ -0,0 +1,56 @@
+Description: Handle partitions on non-512B EFI disks
+Origin: backport, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/4795
+Author: Peter Jones <[e-mail]>
+Author: Vladimir Serbinenko <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1065281
+Forwarded: not-needed
+Last-Update: 2013-09-18
+
+Index: b/grub-core/disk/efi/efidisk.c
+===================================================================
+--- a/grub-core/disk/efi/efidisk.c
++++ b/grub-core/disk/efi/efidisk.c
+@@ -668,9 +668,11 @@
+ 		&& (GRUB_EFI_DEVICE_PATH_SUBTYPE (c->last_device_path)
+ 		    == GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE)
+ 		&& (grub_partition_get_start (disk->partition)
+-		    == hd.partition_start)
++		    == (hd.partition_start << (disk->log_sector_size
++					       - GRUB_DISK_SECTOR_BITS)))
+ 		&& (grub_partition_get_len (disk->partition)
+-		    == hd.partition_size))
++		    == (hd.partition_size << (disk->log_sector_size
++					      - GRUB_DISK_SECTOR_BITS))))
+ 	      {
+ 		handle = c->handle;
+ 		return 1;
+@@ -763,11 +765,14 @@
+       auto int find_partition (grub_disk_t disk, const grub_partition_t part);
+ 
+       /* Find the identical partition.  */
+-      int find_partition (grub_disk_t disk __attribute__ ((unused)),
+-			  const grub_partition_t part)
++      int find_partition (grub_disk_t disk, const grub_partition_t part)
+ 	{
+-	  if (grub_partition_get_start (part) == hd.partition_start
+-	      && grub_partition_get_len (part) == hd.partition_size)
++	  if (grub_partition_get_start (part)
++	      == (hd.partition_start << (disk->log_sector_size
++					 - GRUB_DISK_SECTOR_BITS))
++	      && grub_partition_get_len (part)
++	      == (hd.partition_size << (disk->log_sector_size
++					- GRUB_DISK_SECTOR_BITS)))
+ 	    {
+ 	      partition_name = grub_partition_get_name (part);
+ 	      return 1;
+@@ -799,7 +804,9 @@
+       /* Find a partition which matches the hard drive device path.  */
+       grub_memcpy (&hd, ldp, sizeof (hd));
+       if (hd.partition_start == 0
+-	  && hd.partition_size == grub_disk_get_size (parent))
++	  && (hd.partition_size << (parent->log_sector_size
++				    - GRUB_DISK_SECTOR_BITS))
++	      == grub_disk_get_size (parent))
+ 	{
+ 	  dev_name = grub_strdup (parent->name);
+ 	}

=== added file 'debian/patches/install_bios_setup_path.patch'
--- debian/patches/install_bios_setup_path.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/install_bios_setup_path.patch	2013-10-08 00:15:07 +0000
@@ -0,0 +1,20 @@
+Description: Look for grub-bios-setup in /usr/lib/grub/i386-pc/ as well
+Author: Colin Watson <[e-mail]>
+Bug-Debian: http://bugs.debian.org/705636
+Forwarded: no
+Last-Update: 2013-04-17
+
+Index: b/util/grub-install.in
+===================================================================
+--- a/util/grub-install.in
++++ b/util/grub-install.in
+@@ -363,6 +363,9 @@
+ 
+ if test "x$grub_setup" = x && [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-pc" ]; then
+     grub_setup="${sbindir}/`echo grub-bios-setup | sed ${transform}`"
++    if [ ! -e "$grub_setup" ]; then
++	grub_setup="${source_dir}/`echo grub-bios-setup | sed ${transform}`"
++    fi
+ fi
+ 
+ if test "x$grub_setup" = x && [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "sparc64-ieee1275" ]; then

=== modified file 'debian/patches/install_signed.patch'
--- debian/patches/install_signed.patch	2013-01-29 06:22:50 +0000
+++ debian/patches/install_signed.patch	2013-10-08 00:15:07 +0000
@@ -1,26 +1,22 @@
 Description: Install signed images if UEFI Secure Boot is enabled
 Author: Colin Watson <[e-mail]>
+Author: Stéphane Graber <[e-mail]>
 Forwarded: no
-Last-Update: 2012-12-10
+Last-Update: 2013-08-12
 
 Index: b/util/grub-install.in
 ===================================================================
 --- a/util/grub-install.in
 +++ b/util/grub-install.in
-@@ -63,6 +63,12 @@
+@@ -63,6 +63,7 @@
  
  removable=no
  efi_quiet=
-+sb_var=/sys/firmware/efi/vars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c/data
-+if [ -e "$sb_var" ] && [ "$(printf %x \'"$(cat "$sb_var")")" = 1 ]; then
-+  uefi_secure_boot=yes
-+else
-+  uefi_secure_boot=no
-+fi
++uefi_secure_boot=yes
  
  # Get GRUB_DISTRIBUTOR.
  if test -f "${sysconfdir}/default/grub" ; then
-@@ -117,6 +123,8 @@
+@@ -117,6 +118,8 @@
      print_option_help  "--removable" "$(gettext "the installation device is removable. This option is only available on EFI.")"
      print_option_help  "--bootloader-id=$(gettext "ID")" "$(gettext "the ID of bootloader. This option is only available on EFI.")"
      print_option_help "--efi-directory=$(gettext "DIR")" "$(gettext "use DIR as the EFI System Partition root.")"
@@ -29,7 +25,7 @@
  echo
  gettext "INSTALL_DEVICE must be system device filename.";echo
  echo
-@@ -258,6 +266,11 @@
+@@ -258,6 +261,11 @@
      -f | --force)
          setup_force="--force" ;;
  
@@ -41,7 +37,7 @@
      -*)
  	gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2
  	usage
-@@ -460,39 +473,32 @@
+@@ -460,39 +468,32 @@
          # not collide with other vendors.  To minimise collisions, we use the
          # name of our distributor if possible.
  	efi_distributor="$bootloader_id"
@@ -98,7 +94,7 @@
  	   # TODO: We should also use efibootmgr, if available, to add a Boot
  	   # entry for ourselves.
  	fi
-@@ -653,7 +659,7 @@
+@@ -653,7 +654,7 @@
  	install_drive="$grub_drive"
      fi
  
@@ -107,7 +103,7 @@
          # generic method (used on coreboot and ata mod)
  	uuid=
  	if [ x"$force_file_id" != xy ]; then
-@@ -828,10 +834,32 @@
+@@ -828,10 +829,32 @@
      gettext "You will have to set \`SystemPartition' and \`OSLoader' manually." 1>&2
      echo 1>&2
  elif [ x"$grub_modinfo_platform" = xefi ]; then

=== added file 'debian/patches/maybe_quiet.patch'
--- debian/patches/maybe_quiet.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/maybe_quiet.patch	2013-10-08 00:15:07 +0000
@@ -0,0 +1,362 @@
+Description: Add configure option to reduce visual clutter at boot time
+ If this option is enabled, then do all of the following:
+ .
+ Don't display introductory message about line editing unless we're actually
+ offering a shell prompt.  (This is believed to be a workaround for a
+ different bug.  We'll go with this for now, but will drop this in favour of
+ a better fix upstream if somebody figures out what that is.)
+ .
+ Don't clear the screen just before booting if we never drew the menu in the
+ first place.
+ .
+ Remove verbose messages printed before reading configuration.  In some ways
+ this is awkward because it makes debugging harder, but it's a requirement
+ for a smooth-looking boot process; we may be able to do better in future.
+ Upstream doesn't want this, though.
+ .
+ Disable the cursor as well, for similar reasons of tidiness.
+ .
+ Suppress kernel/initrd progress messages, except in recovery mode.
+ .
+ Suppress "GRUB loading" message unless Shift is held down.  Upstream
+ doesn't want this, as it makes debugging harder.  Ubuntu wants it to
+ provide a cleaner boot experience.
+Author: Colin Watson <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/386922
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/861048
+Forwarded: (partial) http://lists.gnu.org/archive/html/grub-devel/2009-09/msg00056.html
+Last-Update: 2013-08-26
+
+Index: b/config.h.in
+===================================================================
+--- a/config.h.in
++++ b/config.h.in
+@@ -41,6 +41,8 @@
+ #define NEED_REGISTER_FRAME_INFO @NEED_REGISTER_FRAME_INFO@
+ /* Define to 1 to enable disk cache statistics.  */
+ #define DISK_CACHE_STATS @DISK_CACHE_STATS@
++/* Define to 1 to make GRUB quieter at boot time.  */
++#define QUIET_BOOT @QUIET_BOOT@
+ 
+ #define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
+ #define GRUB_PLATFORM "@GRUB_PLATFORM@"
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -1076,6 +1076,17 @@
+ AC_SUBST([LIBZFS])
+ AC_SUBST([LIBNVPAIR])
+ 
++AC_ARG_ENABLE([quiet-boot],
++              [AS_HELP_STRING([--enable-quiet-boot],
++                              [emit fewer messages at boot time (default=no)])],
++              [], [enable_quiet_boot=no])
++if test x"$enable_quiet_boot" = xyes ; then
++  QUIET_BOOT=1
++else
++  QUIET_BOOT=0
++fi
++AC_SUBST([QUIET_BOOT])
++
+ LIBS=""
+ 
+ AC_SUBST([FONT_SOURCE])
+@@ -1232,5 +1243,10 @@
+ else
+ echo With libzfs support: No "($libzfs_excuse)"
+ fi
++if [ x"$enable_quiet_boot" = xyes ]; then
++echo With quiet boot: Yes
++else
++echo With quiet boot: No
++fi
+ echo "*******************************************************"
+ ]
+Index: b/grub-core/boot/i386/pc/boot.S
+===================================================================
+--- a/grub-core/boot/i386/pc/boot.S
++++ b/grub-core/boot/i386/pc/boot.S
+@@ -19,6 +19,9 @@
+ 
+ #include <grub/symbol.h>
+ #include <grub/machine/boot.h>
++#ifdef QUIET_BOOT
++#include <grub/machine/memory.h>
++#endif
+ 
+ /*
+  *  defines for the code go here
+@@ -150,9 +153,17 @@
+ 	/* save drive reference first thing! */
+ 	pushw	%dx
+ 
++#ifdef QUIET_BOOT
++	/* is either shift key held down? */
++	movw	$(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
++	andb	$3, (%bx)
++	jz	2f
++#endif
++
+ 	/* print a notification message on the screen */
+ 	MSG(notification_string)
+ 
++2:
+ 	/* set %si to the disk address packet */
+ 	movw	$disk_address_packet, %si
+ 
+Index: b/grub-core/boot/i386/pc/diskboot.S
+===================================================================
+--- a/grub-core/boot/i386/pc/diskboot.S
++++ b/grub-core/boot/i386/pc/diskboot.S
+@@ -18,6 +18,9 @@
+ 
+ #include <grub/symbol.h>
+ #include <grub/machine/boot.h>
++#ifdef QUIET_BOOT
++#include <grub/machine/memory.h>
++#endif
+ 
+ /*
+  *  defines for the code go here
+@@ -25,6 +28,12 @@
+ 
+ #define MSG(x)	movw $x, %si; call LOCAL(message)
+ 
++#ifdef QUIET_BOOT
++#define SILENT(x)	call LOCAL(check_silent); jz LOCAL(x)
++#else
++#define SILENT(x)
++#endif
++
+ 	.file	"diskboot.S"
+ 
+ 	.text
+@@ -50,11 +59,14 @@
+ 	/* save drive reference first thing! */
+ 	pushw	%dx
+ 
++	SILENT(after_notification_string)
++
+ 	/* print a notification message on the screen */
+ 	pushw	%si
+ 	MSG(notification_string)
+ 	popw	%si
+ 
++LOCAL(after_notification_string):
+ 	/* this sets up for the first run through "bootloop" */
+ 	movw	$LOCAL(firstlist), %di
+ 
+@@ -279,7 +291,10 @@
+ 	/* restore addressing regs and print a dot with correct DS
+ 	   (MSG modifies SI, which is saved, and unused AX and BX) */
+ 	popw	%ds
++	SILENT(after_notification_step)
+ 	MSG(notification_step)
++
++LOCAL(after_notification_step):
+ 	popa
+ 
+ 	/* check if finished with this dataset */
+@@ -295,8 +310,11 @@
+ /* END OF MAIN LOOP */
+ 
+ LOCAL(bootit):
++	SILENT(after_notification_done)
+ 	/* print a newline */
+ 	MSG(notification_done)
++
++LOCAL(after_notification_done):
+ 	popw	%dx	/* this makes sure %dl is our "boot" drive */
+ 	ljmp	$0, $(GRUB_BOOT_MACHINE_KERNEL_ADDR + 0x200)
+ 
+@@ -320,6 +338,14 @@
+ /* go here when you need to stop the machine hard after an error condition */
+ LOCAL(stop):	jmp	LOCAL(stop)
+ 
++#ifdef QUIET_BOOT
++LOCAL(check_silent):
++	/* is either shift key held down? */
++	movw	$(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
++	andb	$3, (%bx)
++	ret
++#endif
++
+ notification_string:	.asciz "loading"
+ 
+ notification_step:	.asciz "."
+Index: b/grub-core/kern/main.c
+===================================================================
+--- a/grub-core/kern/main.c
++++ b/grub-core/kern/main.c
+@@ -207,13 +207,23 @@
+ void __attribute__ ((noreturn))
+ grub_main (void)
+ {
++#ifdef QUIET_BOOT
++  struct grub_term_output *term;
++#endif
++
+   /* First of all, initialize the machine.  */
+   grub_machine_init ();
+ 
++#ifdef QUIET_BOOT
++  /* Disable the cursor until we need it.  */
++  FOR_ACTIVE_TERM_OUTPUTS(term)
++    grub_term_setcursor (term, 0);
++#else
+   /* Hello.  */
+   grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
+   grub_printf ("Welcome to GRUB!\n\n");
+   grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
++#endif
+ 
+   /* Load pre-loaded modules and free the space.  */
+   grub_register_exported_symbols ();
+@@ -232,5 +242,12 @@
+ 
+   grub_load_config ();
+   grub_load_normal_mode ();
++
++#ifdef QUIET_BOOT
++  /* If we have to enter rescue mode, enable the cursor again.  */
++  FOR_ACTIVE_TERM_OUTPUTS(term)
++    grub_term_setcursor (term, 1);
++#endif
++
+   grub_rescue_run ();
+ }
+Index: b/grub-core/kern/rescue_reader.c
+===================================================================
+--- a/grub-core/kern/rescue_reader.c
++++ b/grub-core/kern/rescue_reader.c
+@@ -77,7 +77,9 @@
+ void __attribute__ ((noreturn))
+ grub_rescue_run (void)
+ {
++#ifdef QUIET_BOOT
+   grub_printf ("Entering rescue mode...\n");
++#endif
+ 
+   while (1)
+     {
+Index: b/grub-core/normal/main.c
+===================================================================
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -399,6 +399,15 @@
+ grub_normal_read_line_real (char **line, int cont, int nested)
+ {
+   const char *prompt;
++#ifdef QUIET_BOOT
++  static int displayed_intro;
++
++  if (! displayed_intro)
++    {
++      grub_normal_reader_init (nested);
++      displayed_intro = 1;
++    }
++#endif
+ 
+   if (cont)
+     /* TRANSLATORS: it's command line prompt.  */
+@@ -446,7 +455,9 @@
+       return;
+     }
+ 
++#ifndef QUIET_BOOT
+   grub_normal_reader_init (nested);
++#endif
+ 
+   while (1)
+     {
+Index: b/grub-core/normal/menu.c
+===================================================================
+--- a/grub-core/normal/menu.c
++++ b/grub-core/normal/menu.c
+@@ -669,12 +669,18 @@
+ 
+ /* Callback invoked immediately before a menu entry is executed.  */
+ static void
+-notify_booting (grub_menu_entry_t entry,
++notify_booting (grub_menu_entry_t entry
++#ifdef QUIET_BOOT
++		__attribute__((unused))
++#endif
++		,
+ 		void *userdata __attribute__((unused)))
+ {
++#ifndef QUIET_BOOT
+   grub_printf ("  ");
+   grub_printf_ (N_("Booting `%s'"), entry->title);
+   grub_printf ("\n\n");
++#endif
+ }
+ 
+ /* Callback invoked when a default menu entry executed because of a timeout
+@@ -722,6 +728,9 @@
+       int boot_entry;
+       grub_menu_entry_t e;
+       int auto_boot;
++#ifdef QUIET_BOOT
++      int initial_timeout = grub_menu_get_timeout ();
++#endif
+ 
+       boot_entry = run_menu (menu, nested, &auto_boot);
+       if (boot_entry < 0)
+@@ -731,7 +740,11 @@
+       if (! e)
+ 	continue; /* Menu is empty.  */
+ 
+-      grub_cls ();
++#ifdef QUIET_BOOT
++      /* Only clear the screen if we drew the menu in the first place.  */
++      if (initial_timeout != 0)
++#endif
++	grub_cls ();
+ 
+       if (auto_boot)
+ 	grub_menu_execute_with_fallback (menu, e, autobooted,
+Index: b/util/grub.d/10_linux.in
+===================================================================
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -20,6 +20,7 @@
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ datarootdir="@datarootdir@"
++quiet_boot="@QUIET_BOOT@"
+ 
+ . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+ 
+@@ -140,10 +141,12 @@
+     fi
+     printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
+   fi
+-  message="$(gettext_printf "Loading Linux %s ..." ${version})"
+-  sed "s/^/$submenu_indentation/" << EOF
++  if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
++    message="$(gettext_printf "Loading Linux %s ..." ${version})"
++    sed "s/^/$submenu_indentation/" << EOF
+ 	echo	'$(echo "$message" | grub_quote)'
+ EOF
++  fi
+   if test -d /sys/firmware/efi && test -e "${linux}.efi.signed"; then
+     sed "s/^/$submenu_indentation/" << EOF
+ 	linux	${rel_dirname}/${basename}.efi.signed root=${linux_root_device_thisversion} ro ${args}
+@@ -155,9 +158,13 @@
+   fi
+   if test -n "${initrd}" ; then
+     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
+-    message="$(gettext_printf "Loading initial ramdisk ...")"
+-    sed "s/^/$submenu_indentation/" << EOF
++    if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
++      message="$(gettext_printf "Loading initial ramdisk ...")"
++      sed "s/^/$submenu_indentation/" << EOF
+ 	echo	'$(echo "$message" | grub_quote)'
++EOF
++    fi
++    sed "s/^/$submenu_indentation/" << EOF
+ 	initrd	${rel_dirname}/${initrd}
+ EOF
+   fi

=== added file 'debian/patches/mkconfig_emacs_autosave.patch'
--- debian/patches/mkconfig_emacs_autosave.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/mkconfig_emacs_autosave.patch	2013-10-08 00:15:07 +0000
@@ -0,0 +1,20 @@
+Description: Fix detection of Emacs autosave files
+Author: Colin Watson <[e-mail]>
+Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/5089
+Forwarded: not-needed
+Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/5089
+Last-Update: 2013-08-11
+
+Index: b/util/grub-mkconfig.in
+===================================================================
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -253,7 +253,7 @@
+     # emacsen backup files. FIXME: support other editors
+     *~) ;;
+     # emacsen autosave files. FIXME: support other editors
+-    \#*\#) ;;
++    */\#*\#) ;;
+     *)
+       if grub_file_is_not_garbage "$i" && test -x "$i" ; then
+         echo

=== modified file 'debian/patches/mkconfig_signed_kernel.patch'
--- debian/patches/mkconfig_signed_kernel.patch	2013-01-29 06:15:21 +0000
+++ debian/patches/mkconfig_signed_kernel.patch	2013-10-08 00:15:07 +0000
@@ -7,7 +7,7 @@
 ===================================================================
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -140,8 +140,16 @@
+@@ -143,8 +143,16 @@
    message="$(gettext_printf "Loading Linux %s ..." ${version})"
    sed "s/^/$submenu_indentation/" << EOF
  	echo	'$(echo "$message" | grub_quote)'
@@ -24,7 +24,7 @@
    if test -n "${initrd}" ; then
      # TRANSLATORS: ramdisk isn't identifier. Should be translated.
      message="$(gettext_printf "Loading initial ramdisk ...")"
-@@ -187,6 +195,13 @@
+@@ -190,6 +198,13 @@
  is_first_entry=true
  while [ "x$list" != "x" ] ; do
    linux=`version_find_latest $list`

=== modified file 'debian/patches/mkconfig_ubuntu_distributor.patch'
--- debian/patches/mkconfig_ubuntu_distributor.patch	2013-01-29 05:50:16 +0000
+++ debian/patches/mkconfig_ubuntu_distributor.patch	2013-10-08 00:15:07 +0000
@@ -2,23 +2,27 @@
  Ubuntu is called "Ubuntu", not "Ubuntu GNU/Linux".
 Author: Mario Limonciello <[e-mail]>
 Author: Colin Watson <[e-mail]>
+Author: Harald Sitter <[e-mail]>
 Forwarded: not-needed
-Last-Update: 2013-01-29
+Last-Update: 2013-08-12
 
 Index: b/util/grub.d/10_linux.in
 ===================================================================
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -31,7 +31,11 @@
+@@ -31,7 +31,14 @@
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
    OS=GNU/Linux
  else
 -  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  if [ "${GRUB_DISTRIBUTOR}" = "Ubuntu" ] ; then
-+    OS="${GRUB_DISTRIBUTOR}"
-+  else
-+    OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  fi
++  case ${GRUB_DISTRIBUTOR} in
++    Ubuntu|Kubuntu)
++      OS="${GRUB_DISTRIBUTOR}"
++      ;;
++    *)
++      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++      ;;
++  esac
    CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
  fi
  

=== added file 'debian/patches/os_prober_efi.patch'
--- debian/patches/os_prober_efi.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/os_prober_efi.patch	2013-10-08 00:15:07 +0000
@@ -0,0 +1,36 @@
+Index: b/util/grub.d/30_os-prober.in
+===================================================================
+--- a/util/grub.d/30_os-prober.in
++++ b/util/grub.d/30_os-prober.in
+@@ -35,6 +35,11 @@
+   exit 0
+ fi
+ 
++# Try to load the efivars module, in case it's needed for EFI support
++# to work below. Hide the errors in case it's not available, there is
++# no need to scare people here.
++modprobe efivars >/dev/null 2>&1 || true
++
+ OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
+ if [ -z "${OSPROBED}" ] ; then
+   # empty os-prober output, nothing doing
+@@ -144,6 +149,19 @@
+ }
+ EOF
+     ;;
++    efi)
++      EFIPATH=${DEVICE#*@}
++      DEVICE=${DEVICE%@*}
++      cat << EOF
++menuentry "${LONGNAME} (UEFI on ${DEVICE})" --class windows --class os {
++EOF
++      save_default_entry | sed -e "s/^/\t/"
++      prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
++      cat <<EOF
++	chainloader ${EFIPATH}
++}
++EOF
++    ;;
+     linux)
+       LINUXPROBED="`linux-boot-prober ${DEVICE} 2> /dev/null | tr ' ' '^' | paste -s -d ' '`"
+       prepare_boot_cache=

=== added file 'debian/patches/probe_error_handling.patch'
--- debian/patches/probe_error_handling.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/probe_error_handling.patch	2013-10-08 00:15:07 +0000
@@ -0,0 +1,22 @@
+Description: Fix spurious failure on Xen partition devices without disk devices
+ Zero out grub_errno in the case where we handle GRUB_ERR_UNKNOWN_DEVICE by
+ falling back to the partition device, otherwise a later call to this
+ function may fail spuriously.
+Author: Colin Watson <[e-mail]>
+Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/5092
+Bug-Debian: http://bugs.debian.org/708614
+Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/5092
+Last-Update: 2013-08-13
+
+Index: b/util/getroot.c
+===================================================================
+--- a/util/getroot.c
++++ b/util/getroot.c
+@@ -2316,6 +2316,7 @@
+ 	    grub_util_warn
+ 	      (_("disk does not exist, so falling back to partition device %s"),
+ 	       os_dev);
++	    grub_errno = GRUB_ERR_NONE;
+ 
+ 	    canon = canonicalize_file_name (os_dev);
+ 	    drive = find_system_device (canon ? : os_dev, &st, 0, 1);

=== modified file 'debian/patches/restore_mkdevicemap.patch'
--- debian/patches/restore_mkdevicemap.patch	2012-09-05 13:02:04 +0000
+++ debian/patches/restore_mkdevicemap.patch	2013-10-08 00:15:07 +0000
@@ -961,7 +961,7 @@
 +	      dmraid_check (node_name, "dm_tree_node_get_name failed\n");
 +	      node_uuid = dm_tree_node_get_uuid (second);
 +	      dmraid_check (node_uuid, "dm_tree_node_get_uuid failed\n");
-+	      if (strncmp (node_uuid, "DMRAID-", 7) != 0)
++	      if (strstr (node_uuid, "DMRAID-") == 0)
 +		{
 +		  grub_dprintf ("deviceiter", "%s is not DM-RAID\n", node_name);
 +		  goto dmraid_next_child;

=== added file 'debian/patches/script_check_no_commands.patch'
--- debian/patches/script_check_no_commands.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/script_check_no_commands.patch	2013-10-08 00:15:07 +0000
@@ -0,0 +1,87 @@
+Description: Guard against scripts containing no commands
+ Make grub-script-check fail on scripts containing no commands, to guard
+ against corrupted grub-mkconfig setups that produce no useful output.
+Origin: backport, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/5044
+Author: Colin Watson <[e-mail]>
+Bug-Debian: http://bugs.debian.org/713886
+Forwarded: not-needed
+Last-Update: 2013-07-13
+
+Index: b/Makefile.util.def
+===================================================================
+--- a/Makefile.util.def
++++ b/Makefile.util.def
+@@ -701,6 +701,12 @@
+ 
+ script = {
+   testcase;
++  name = grub_script_no_commands;
++  common = tests/grub_script_no_commands.in;
++};
++
++script = {
++  testcase;
+   name = partmap_test;
+   common = tests/partmap_test.in;
+ };
+Index: b/tests/grub_script_no_commands.in
+===================================================================
+--- /dev/null
++++ b/tests/grub_script_no_commands.in
+@@ -0,0 +1,21 @@
++#! /bin/sh
++set -e
++
++# grub-script-check refuses to pass a file with no commands; this usually
++# indicates a bug in the code generating that file.
++
++@builddir@/grub-script-check <<EOF && exit 1
++
++EOF
++
++@builddir@/grub-script-check <<EOF && exit 1
++# comment
++EOF
++
++@builddir@/grub-script-check <<EOF && exit 1
++# comment 1
++# comment 2
++
++EOF
++
++exit 0
+Index: b/util/grub-script-check.c
+===================================================================
+--- a/util/grub-script-check.c
++++ b/util/grub-script-check.c
+@@ -92,7 +92,7 @@
+   int lineno = 0;
+   FILE *file = 0;
+   struct arguments arguments;
+-  int found_input = 0;
++  int found_input = 0, found_cmd = 0;
+   struct grub_script *script = NULL;
+ 
+   auto grub_err_t get_config_line (char **line, int cont);
+@@ -177,6 +177,8 @@
+       script = grub_script_parse (input, get_config_line);
+       if (script)
+ 	{
++	  if (script->cmd)
++	    found_cmd = 1;
+ 	  grub_script_execute (script);
+ 	  grub_script_free (script);
+ 	}
+@@ -191,6 +193,12 @@
+       fprintf (stderr, _("Syntax error at line %u\n"), lineno);
+       return 1;
+     }
++  if (! found_cmd)
++    {
++      fprintf (stderr, _("Script contains no commands and will do nothing\n"),
++	       arguments.filename);
++      return 1;
++    }
+ 
+   return 0;
+ }

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-03-13 00:30:03 +0000
+++ debian/patches/series	2013-10-08 00:15:07 +0000
@@ -43,17 +43,22 @@
 linuxefi_non_sb_fallback.patch
 mkconfig_signed_kernel.patch
 install_signed.patch
+install_bios_setup_path.patch
+os_prober_efi.patch
+acpihalt_improvements.patch
+script_check_no_commands.patch
+texinfo_ordering.patch
+mkconfig_emacs_autosave.patch
+sleep_shift.patch
+probe_error_handling.patch
+wubi_no_windows.patch
+maybe_quiet.patch
+efidisk_non_512_sectors.patch
 ubuntu_crashkernel.patch
 ubuntu_quick_boot.patch
-ubuntu_sleep_shift.patch
-ubuntu_normal_quiet.patch
-ubuntu_really_quiet.patch
-ubuntu_linux_quiet.patch
 ubuntu_failed_boot_menu.patch
-ubuntu_quiet_grub_loading.patch
 ubuntu_gfxpayload_filter.patch
 ubuntu_vt_handoff.patch
 ubuntu_recovery_nomodeset.patch
-ubuntu_wubi_no_windows.patch
 ubuntu_probe_dmraid.patch
-ubuntu_acpihalt_improvements.patch
+efi_always_install_grub_cfg.patch

=== added file 'debian/patches/sleep_shift.patch'
--- debian/patches/sleep_shift.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/sleep_shift.patch	2013-10-08 00:15:07 +0000
@@ -0,0 +1,53 @@
+Description: Allow Shift to interrupt 'sleep --interruptible'
+ Upstream would like to consider this at more length. See
+ http://lists.gnu.org/archive/html/grub-devel/2009-08/msg00718.html, and the
+ rest of the thread for context.
+Author: Colin Watson <[e-mail]>
+Forwarded: http://lists.gnu.org/archive/html/grub-devel/2009-08/msg00694.html
+Last-Update: 2012-09-06
+
+Index: b/grub-core/commands/sleep.c
+===================================================================
+--- a/grub-core/commands/sleep.c
++++ b/grub-core/commands/sleep.c
+@@ -46,6 +46,31 @@
+   grub_refresh ();
+ }
+ 
++static int
++grub_check_keyboard (void)
++{
++  int mods = 0;
++  grub_term_input_t term;
++
++  if (grub_term_poll_usb)
++    grub_term_poll_usb ();
++
++  FOR_ACTIVE_TERM_INPUTS(term)
++  {
++    if (term->getkeystatus)
++      mods |= term->getkeystatus (term);
++  }
++
++  if (mods >= 0 &&
++      (mods & (GRUB_TERM_STATUS_LSHIFT | GRUB_TERM_STATUS_RSHIFT)) != 0)
++    return 1;
++
++  if (grub_getkey_noblock () == GRUB_TERM_ESC)
++    return 1;
++
++  return 0;
++}
++
+ /* Based on grub_millisleep() from kern/generic/millisleep.c.  */
+ static int
+ grub_interruptible_millisleep (grub_uint32_t ms)
+@@ -55,7 +80,7 @@
+   start = grub_get_time_ms ();
+ 
+   while (grub_get_time_ms () - start < ms)
+-    if (grub_getkey_noblock () == GRUB_TERM_ESC)
++    if (grub_check_keyboard ())
+       return 1;
+ 
+   return 0;

=== added file 'debian/patches/texinfo_ordering.patch'
--- debian/patches/texinfo_ordering.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/texinfo_ordering.patch	2013-10-08 00:15:07 +0000
@@ -0,0 +1,21 @@
+Description: Move @itemize after @subsection to satisfy texinfo-5.1
+Author: Bryan Hundven <[e-mail]>
+Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/4813
+Forwarded: not-needed
+Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/4813
+Last-Update: 2013-08-11
+
+Index: b/docs/grub-dev.texi
+===================================================================
+--- a/docs/grub-dev.texi
++++ b/docs/grub-dev.texi
+@@ -1394,8 +1394,8 @@
+ 
+ @node Bitmap API
+ @section Bitmap API
+-@itemize
+ @subsection grub_video_bitmap_create
++@itemize
+ @item Prototype:
+ @example
+ grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format)

=== removed file 'debian/patches/ubuntu_acpihalt_improvements.patch'
--- debian/patches/ubuntu_acpihalt_improvements.patch	2013-03-13 00:30:03 +0000
+++ debian/patches/ubuntu_acpihalt_improvements.patch	1970-01-01 00:00:00 +0000
@@ -1,191 +0,0 @@
-Description: acpihalt: expand parser to handle SSDTs and some more opcodes
-Author: Colin Watson <[e-mail]>
-Forwarded: https://lists.gnu.org/archive/html/grub-devel/2013-03/msg00060.html
-Last-Update: 2013-03-13
-
-Index: b/grub-core/commands/acpihalt.c
-===================================================================
---- a/grub-core/commands/acpihalt.c
-+++ b/grub-core/commands/acpihalt.c
-@@ -41,6 +41,7 @@
- #endif
- 
- #ifndef GRUB_DSDT_TEST
-+#include <grub/mm.h>
- #include <grub/misc.h>
- #include <grub/time.h>
- #include <grub/cpu/io.h>
-@@ -146,6 +147,10 @@
-       ptr += skip_name_string (ptr, end);
-       ptr++;
-       break;
-+    case GRUB_ACPI_EXTOPCODE_EVENT_OP:
-+      ptr++;
-+      ptr += skip_name_string (ptr, end);
-+      break;
-     case GRUB_ACPI_EXTOPCODE_OPERATION_REGION:
-       ptr++;
-       ptr += skip_name_string (ptr, end);
-@@ -158,7 +163,12 @@
- 	return 0;
-       break;
-     case GRUB_ACPI_EXTOPCODE_FIELD_OP:
-+    case GRUB_ACPI_EXTOPCODE_DEVICE_OP:
-+    case GRUB_ACPI_EXTOPCODE_PROCESSOR_OP:
-+    case GRUB_ACPI_EXTOPCODE_POWER_RES_OP:
-+    case GRUB_ACPI_EXTOPCODE_THERMAL_ZONE_OP:
-     case GRUB_ACPI_EXTOPCODE_INDEX_FIELD_OP:
-+    case GRUB_ACPI_EXTOPCODE_BANK_FIELD_OP:
-       ptr++;
-       ptr += decode_length (ptr, 0);
-       break;
-@@ -170,12 +180,14 @@
- }
- 
- static int
--get_sleep_type (grub_uint8_t *table, grub_uint8_t *end)
-+get_sleep_type (grub_uint8_t *table, grub_uint8_t *ptr, grub_uint8_t *end,
-+		grub_uint8_t *scope, int scope_len)
- {
--  grub_uint8_t *ptr, *prev = table;
--  int sleep_type = -1;
-+  grub_uint8_t *prev = table;
-+  int sleep_type = -2;
-   
--  ptr = table + sizeof (struct grub_acpi_table_header);
-+  if (!ptr)
-+    ptr = table + sizeof (struct grub_acpi_table_header);
-   while (ptr < end && prev < ptr)
-     {
-       int add;
-@@ -202,7 +214,8 @@
- 	  }
- 	case GRUB_ACPI_OPCODE_NAME:
- 	  ptr++;
--	  if (memcmp (ptr, "_S5_", 4) == 0 || memcmp (ptr, "\\_S5_", 4) == 0)
-+	  if ((!scope || memcmp (scope, "\\", scope_len) == 0) &&
-+	      (memcmp (ptr, "_S5_", 4) == 0 || memcmp (ptr, "\\_S5_", 4) == 0))
- 	    {
- 	      int ll;
- 	      grub_uint8_t *ptr2 = ptr;
-@@ -241,6 +254,25 @@
- 	    return -1;
- 	  break;
- 	case GRUB_ACPI_OPCODE_SCOPE:
-+	  {
-+	    int scope_sleep_type;
-+	    int ll;
-+	    grub_uint8_t *name;
-+	    int name_len;
-+
-+	    ptr++;
-+	    add = decode_length (ptr, &ll);
-+	    name = ptr + ll;
-+	    name_len = skip_name_string (name, ptr + add);
-+	    if (!name_len)
-+	      return -1;
-+	    scope_sleep_type = get_sleep_type (table, name + name_len,
-+					       ptr + add, name, name_len);
-+	    if (scope_sleep_type != -2)
-+	      return scope_sleep_type;
-+	    ptr += add;
-+	    break;
-+	  }
- 	case GRUB_ACPI_OPCODE_IF:
- 	case GRUB_ACPI_OPCODE_METHOD:
- 	  {
-@@ -291,7 +323,7 @@
-       return 2;
-     }
- 
--  printf ("Sleep type = %d\n", get_sleep_type (buf, buf + len));
-+  printf ("Sleep type = %d\n", get_sleep_type (buf, NULL, buf + len, NULL, 0));
-   free (buf);
-   fclose (f);
-   return 0;
-@@ -304,8 +336,10 @@
- {
-   struct grub_acpi_rsdp_v20 *rsdp2;
-   struct grub_acpi_rsdp_v10 *rsdp1;
--      struct grub_acpi_table_header *rsdt;
--      grub_uint32_t *entry_ptr;
-+  struct grub_acpi_table_header *rsdt;
-+  grub_uint32_t *entry_ptr;
-+  grub_uint32_t port = 0;
-+  int sleep_type = -1;
- 
-   rsdp2 = grub_acpi_get_rsdpv2 ();
-   if (rsdp2)
-@@ -324,33 +358,39 @@
-     {
-       if (grub_memcmp ((void *) (grub_addr_t) *entry_ptr, "FACP", 4) == 0)
- 	{
--	  grub_uint32_t port;
- 	  struct grub_acpi_fadt *fadt
- 	    = ((struct grub_acpi_fadt *) (grub_addr_t) *entry_ptr);
- 	  struct grub_acpi_table_header *dsdt
- 	    = (struct grub_acpi_table_header *) (grub_addr_t) fadt->dsdt_addr;
--	  int sleep_type = -1;
-+	  grub_uint8_t *buf = (grub_uint8_t *) dsdt;
- 
- 	  port = fadt->pm1a;
- 
- 	  grub_dprintf ("acpi", "PM1a port=%x\n", port);
- 
- 	  if (grub_memcmp (dsdt->signature, "DSDT",
--			   sizeof (dsdt->signature)) != 0)
--	    break;
-+			   sizeof (dsdt->signature)) == 0)
-+	    sleep_type = get_sleep_type (buf, NULL, buf + dsdt->length,
-+					 NULL, 0);
-+	}
-+      else if (grub_memcmp ((void *) (grub_addr_t) *entry_ptr, "SSDT", 4) == 0)
-+	{
-+	  struct grub_acpi_table_header *ssdt
-+	    = (struct grub_acpi_table_header *) (grub_addr_t) *entry_ptr;
-+	  grub_uint8_t *buf = (grub_uint8_t *) ssdt;
- 
--	  sleep_type = get_sleep_type ((grub_uint8_t *) dsdt,
--				       (grub_uint8_t *) dsdt + dsdt->length);
-+	  grub_dprintf ("acpi", "SSDT = %p\n", ssdt);
- 
--	  if (sleep_type < 0 || sleep_type >= 8)
--	    break;
-+	  sleep_type = get_sleep_type (buf, NULL, buf + ssdt->length, NULL, 0);
-+	}
-+    }
- 
--	  grub_dprintf ("acpi", "SLP_TYP = %d, port = 0x%x\n",
--			sleep_type, port);
-+  if (port && sleep_type >= 0 && sleep_type < 8)
-+    {
-+      grub_dprintf ("acpi", "SLP_TYP = %d, port = 0x%x\n", sleep_type, port);
- 
--	  grub_outw (GRUB_ACPI_SLP_EN
--	  	     | (sleep_type << GRUB_ACPI_SLP_TYP_OFFSET), port & 0xffff);
--	}
-+      grub_outw (GRUB_ACPI_SLP_EN | (sleep_type << GRUB_ACPI_SLP_TYP_OFFSET),
-+		 port & 0xffff);
-     }
- 
-   grub_millisleep (1500);
-Index: b/include/grub/acpi.h
-===================================================================
---- a/include/grub/acpi.h
-+++ b/include/grub/acpi.h
-@@ -174,9 +174,15 @@
- enum
-   {
-     GRUB_ACPI_EXTOPCODE_MUTEX = 0x01,
-+    GRUB_ACPI_EXTOPCODE_EVENT_OP = 0x02,
-     GRUB_ACPI_EXTOPCODE_OPERATION_REGION = 0x80,
-     GRUB_ACPI_EXTOPCODE_FIELD_OP = 0x81,
-+    GRUB_ACPI_EXTOPCODE_DEVICE_OP = 0x82,
-+    GRUB_ACPI_EXTOPCODE_PROCESSOR_OP = 0x83,
-+    GRUB_ACPI_EXTOPCODE_POWER_RES_OP = 0x84,
-+    GRUB_ACPI_EXTOPCODE_THERMAL_ZONE_OP = 0x85,
-     GRUB_ACPI_EXTOPCODE_INDEX_FIELD_OP = 0x86,
-+    GRUB_ACPI_EXTOPCODE_BANK_FIELD_OP = 0x87,
-   };
- 
- #endif /* ! GRUB_ACPI_HEADER */

=== modified file 'debian/patches/ubuntu_crashkernel.patch'
--- debian/patches/ubuntu_crashkernel.patch	2013-02-01 17:45:21 +0000
+++ debian/patches/ubuntu_crashkernel.patch	2013-10-08 00:15:07 +0000
@@ -11,7 +11,7 @@
 ===================================================================
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -82,6 +82,11 @@
+@@ -86,6 +86,11 @@
  
  title_correction_code=
  
@@ -23,7 +23,7 @@
  linux_entry ()
  {
    os="$1"
-@@ -248,7 +253,7 @@
+@@ -258,7 +263,7 @@
  
    if [ "x$is_first_entry" = xtrue ]; then
      linux_entry "${OS}" "${version}" simple \
@@ -32,7 +32,7 @@
  
      submenu_indentation="\t"
      
-@@ -260,7 +265,7 @@
+@@ -270,7 +275,7 @@
    fi
  
    linux_entry "${OS}" "${version}" advanced \

=== modified file 'debian/patches/ubuntu_failed_boot_menu.patch'
--- debian/patches/ubuntu_failed_boot_menu.patch	2013-02-01 17:45:21 +0000
+++ debian/patches/ubuntu_failed_boot_menu.patch	2013-10-08 00:15:07 +0000
@@ -2,14 +2,23 @@
  "Failure" here is defined as failing to get to the end of one of the normal
  runlevels.
 Author: Colin Watson <[e-mail]>
+Author: Richard Laager <[e-mail]>
 Forwarded: no
-Last-Update: 2012-09-06
+Last-Update: 2013-09-11
 
 Index: b/util/grub.d/00_header.in
 ===================================================================
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
-@@ -46,6 +46,7 @@
+@@ -23,6 +23,7 @@
+ exec_prefix="@exec_prefix@"
+ datarootdir="@datarootdir@"
+ grub_lang=`echo $LANG | cut -d . -f 1`
++grubdir="`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`"
+ 
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+@@ -46,6 +47,7 @@
  
  cat << EOF
  if [ -s \$prefix/grubenv ]; then
@@ -17,19 +26,32 @@
    load_env
  fi
  EOF
-@@ -87,6 +88,11 @@
+@@ -87,6 +89,24 @@
    fi
  }
  
 +function recordfail {
 +  set recordfail=1
++EOF
++FS="$(grub-probe --target=fs "${grubdir}")"
++case "$FS" in
++  btrfs | cpiofs | newc | odc | romfs | squash4 | tarfs | zfs)
++    cat <<EOF
++  # GRUB lacks write support for $FS, so recordfail support is disabled.
++EOF
++    ;;
++  *)
++    cat <<EOF
 +  if [ -n "\${have_grubenv}" ]; then if [ -z "\${boot_once}" ]; then save_env recordfail; fi; fi
++EOF
++esac
++cat <<EOF
 +}
 +
  function load_video {
  EOF
  if [ -n "${GRUB_VIDEO_BACKEND}" ]; then
-@@ -273,7 +279,11 @@
+@@ -273,7 +293,11 @@
  make_timeout ()
  {
      cat << EOF
@@ -46,7 +68,7 @@
 ===================================================================
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -114,6 +114,7 @@
+@@ -118,6 +118,7 @@
    else
        echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
    fi      

=== modified file 'debian/patches/ubuntu_gfxpayload_filter.patch'
--- debian/patches/ubuntu_gfxpayload_filter.patch	2013-02-01 17:45:21 +0000
+++ debian/patches/ubuntu_gfxpayload_filter.patch	2013-10-08 00:15:07 +0000
@@ -177,7 +177,7 @@
 ===================================================================
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -127,8 +127,8 @@
+@@ -131,8 +131,8 @@
        if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
  	  echo "	load_video" | sed "s/^/$submenu_indentation/"
        fi
@@ -187,7 +187,7 @@
  
    echo "	insmod gzio" | sed "s/^/$submenu_indentation/"
  
-@@ -200,6 +200,35 @@
+@@ -204,6 +204,35 @@
  boot_device_id=
  title_correction_code=
  

=== removed file 'debian/patches/ubuntu_linux_quiet.patch'
--- debian/patches/ubuntu_linux_quiet.patch	2013-02-01 17:45:21 +0000
+++ debian/patches/ubuntu_linux_quiet.patch	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-Description: Suppress kernel/initrd progress messages, except in recovery mode
-Author: Colin Watson <[e-mail]>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/386922
-Forwarded: no
-Last-Update: 2013-02-01
-
-Index: b/util/grub.d/10_linux.in
-===================================================================
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -142,10 +142,12 @@
-     fi
-     printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
-   fi
--  message="$(gettext_printf "Loading Linux %s ..." ${version})"
--  sed "s/^/$submenu_indentation/" << EOF
-+  if [ x$type != xsimple ]; then
-+    message="$(gettext_printf "Loading Linux %s ..." ${version})"
-+    sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$(echo "$message" | grub_quote)'
- EOF
-+  fi
-   if test -d /sys/firmware/efi && test -e "${linux}.efi.signed"; then
-     sed "s/^/$submenu_indentation/" << EOF
- 	linux	${rel_dirname}/${basename}.efi.signed root=${linux_root_device_thisversion} ro ${args}
-@@ -157,9 +159,13 @@
-   fi
-   if test -n "${initrd}" ; then
-     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
--    message="$(gettext_printf "Loading initial ramdisk ...")"
--    sed "s/^/$submenu_indentation/" << EOF
-+    if [ x$type != xsimple ]; then
-+      message="$(gettext_printf "Loading initial ramdisk ...")"
-+      sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$(echo "$message" | grub_quote)'
-+EOF
-+    fi
-+    sed "s/^/$submenu_indentation/" << EOF
- 	initrd	${rel_dirname}/${initrd}
- EOF
-   fi

=== removed file 'debian/patches/ubuntu_normal_quiet.patch'
--- debian/patches/ubuntu_normal_quiet.patch	2012-09-07 12:39:02 +0000
+++ debian/patches/ubuntu_normal_quiet.patch	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-Description: Reduce visual clutter in normal mode
- Don't display introductory message about line editing unless we're actually
- offering a shell prompt.  (This is believed to be a workaround for a
- different bug.  We'll go with this for now, but will drop this in favour of
- a better fix upstream if somebody figures out what that is.)
- .
- Don't clear the screen just before booting if we never drew the menu in the
- first place.
-Author: Colin Watson <[e-mail]>
-Forwarded: http://lists.gnu.org/archive/html/grub-devel/2009-09/msg00056.html
-Last-Update: 2012-09-06
-
-Index: b/grub-core/normal/main.c
-===================================================================
---- a/grub-core/normal/main.c
-+++ b/grub-core/normal/main.c
-@@ -399,6 +399,13 @@
- grub_normal_read_line_real (char **line, int cont, int nested)
- {
-   const char *prompt;
-+  static int displayed_intro;
-+
-+  if (! displayed_intro)
-+    {
-+      grub_normal_reader_init (nested);
-+      displayed_intro = 1;
-+    }
- 
-   if (cont)
-     /* TRANSLATORS: it's command line prompt.  */
-@@ -446,8 +453,6 @@
-       return;
-     }
- 
--  grub_normal_reader_init (nested);
--
-   while (1)
-     {
-       char *line;
-Index: b/grub-core/normal/menu.c
-===================================================================
---- a/grub-core/normal/menu.c
-+++ b/grub-core/normal/menu.c
-@@ -722,6 +722,7 @@
-       int boot_entry;
-       grub_menu_entry_t e;
-       int auto_boot;
-+      int initial_timeout = grub_menu_get_timeout ();
- 
-       boot_entry = run_menu (menu, nested, &auto_boot);
-       if (boot_entry < 0)
-@@ -731,7 +732,9 @@
-       if (! e)
- 	continue; /* Menu is empty.  */
- 
--      grub_cls ();
-+      /* Only clear the screen if we drew the menu in the first place.  */
-+      if (initial_timeout != 0)
-+	grub_cls ();
- 
-       if (auto_boot)
- 	grub_menu_execute_with_fallback (menu, e, autobooted,

=== modified file 'debian/patches/ubuntu_quick_boot.patch'
--- debian/patches/ubuntu_quick_boot.patch	2012-09-26 16:27:19 +0000
+++ debian/patches/ubuntu_quick_boot.patch	2013-10-08 00:15:07 +0000
@@ -10,7 +10,7 @@
  https://wiki.ubuntu.com/DesktopExperienceTeam/KarmicBootExperienceDesignSpec#Bootloader.
 Author: Colin Watson <[e-mail]>
 Forwarded: no
-Last-Update: 2012-09-26
+Last-Update: 2013-05-09
 
 Index: b/util/grub.d/00_header.in
 ===================================================================
@@ -44,7 +44,7 @@
 ===================================================================
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
-@@ -26,22 +26,80 @@
+@@ -26,12 +26,68 @@
  
  . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
  
@@ -113,6 +113,7 @@
    exit 0
  fi
  
+@@ -43,10 +99,12 @@
  OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
  if [ -z "${OSPROBED}" ] ; then
    # empty os-prober output, nothing doing
@@ -125,15 +126,23 @@
      if [ x$2 = x32 ]; then
          # TRANSLATORS: it refers to kernel architecture (32-bit)
  	bitstr="$(gettext "(32-bit)")"
-@@ -122,6 +180,7 @@
-   case ${BOOT} in
-     chain)
+@@ -146,6 +204,7 @@
+ 	  ;;
+       esac
  
 +      found_other_os=1
  	  onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
        cat << EOF
  menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --class os \$menuentry_id_option 'osprober-chain-$(grub_get_device_id "${DEVICE}")' {
-@@ -174,6 +233,7 @@
+@@ -169,6 +228,7 @@
+ EOF
+     ;;
+     efi)
++      found_other_os=1
+       EFIPATH=${DEVICE#*@}
+       DEVICE=${DEVICE%@*}
+       cat << EOF
+@@ -211,6 +271,7 @@
  	  [ "${prepare_boot_cache}" ] || continue
  	fi
  
@@ -141,7 +150,7 @@
  	onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
  	recovery_params="$(echo "${LPARAMS}" | grep 'single\|recovery')" || true
  	counter=1
-@@ -240,6 +300,7 @@
+@@ -277,6 +338,7 @@
        osx_entry xnu_kernel64 64
      ;;
      hurd)
@@ -149,7 +158,7 @@
        onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
        cat << EOF
  menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class hurd --class gnu --class os \$menuentry_id_option 'osprober-gnuhurd-/boot/gnumach.gz-false-$(grub_get_device_id "${DEVICE}")' {
-@@ -272,3 +333,5 @@
+@@ -309,3 +371,5 @@
      ;;
    esac
  done

=== removed file 'debian/patches/ubuntu_quiet_grub_loading.patch'
--- debian/patches/ubuntu_quiet_grub_loading.patch	2012-09-07 12:39:02 +0000
+++ debian/patches/ubuntu_quiet_grub_loading.patch	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-Description: Suppress "GRUB loading" message unless Shift is held down
- Upstream doesn't want this, as it makes debugging harder.  Ubuntu wants it
- to provide a cleaner boot experience.
-Author: Colin Watson <[e-mail]>
-Forwarded: not-needed
-Last-Update: 2012-09-06
-
-Index: b/grub-core/boot/i386/pc/boot.S
-===================================================================
---- a/grub-core/boot/i386/pc/boot.S
-+++ b/grub-core/boot/i386/pc/boot.S
-@@ -18,6 +18,7 @@
-  */
- 
- #include <grub/symbol.h>
-+#include <grub/machine/memory.h>
- #include <grub/machine/boot.h>
- 
- /*
-@@ -150,9 +151,15 @@
- 	/* save drive reference first thing! */
- 	pushw	%dx
- 
-+	/* is either shift key held down? */
-+	movw	$(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
-+	andb	$3, (%bx)
-+	jz	2f
-+
- 	/* print a notification message on the screen */
- 	MSG(notification_string)
- 
-+2:
- 	/* set %si to the disk address packet */
- 	movw	$disk_address_packet, %si
- 
-Index: b/grub-core/boot/i386/pc/diskboot.S
-===================================================================
---- a/grub-core/boot/i386/pc/diskboot.S
-+++ b/grub-core/boot/i386/pc/diskboot.S
-@@ -17,6 +17,7 @@
-  */
- 
- #include <grub/symbol.h>
-+#include <grub/machine/memory.h>
- #include <grub/machine/boot.h>
- 
- /*
-@@ -24,6 +25,7 @@
-  */
- 
- #define MSG(x)	movw $x, %si; call LOCAL(message)
-+#define SILENT(x)	call LOCAL(check_silent); jz LOCAL(x)
- 
- 	.file	"diskboot.S"
- 
-@@ -50,11 +52,14 @@
- 	/* save drive reference first thing! */
- 	pushw	%dx
- 
-+	SILENT(after_notification_string)
-+
- 	/* print a notification message on the screen */
- 	pushw	%si
- 	MSG(notification_string)
- 	popw	%si
- 
-+LOCAL(after_notification_string):
- 	/* this sets up for the first run through "bootloop" */
- 	movw	$LOCAL(firstlist), %di
- 
-@@ -279,7 +284,10 @@
- 	/* restore addressing regs and print a dot with correct DS
- 	   (MSG modifies SI, which is saved, and unused AX and BX) */
- 	popw	%ds
-+	SILENT(after_notification_step)
- 	MSG(notification_step)
-+
-+LOCAL(after_notification_step):
- 	popa
- 
- 	/* check if finished with this dataset */
-@@ -295,8 +303,11 @@
- /* END OF MAIN LOOP */
- 
- LOCAL(bootit):
-+	SILENT(after_notification_done)
- 	/* print a newline */
- 	MSG(notification_done)
-+
-+LOCAL(after_notification_done):
- 	popw	%dx	/* this makes sure %dl is our "boot" drive */
- 	ljmp	$0, $(GRUB_BOOT_MACHINE_KERNEL_ADDR + 0x200)
- 
-@@ -320,6 +331,12 @@
- /* go here when you need to stop the machine hard after an error condition */
- LOCAL(stop):	jmp	LOCAL(stop)
- 
-+LOCAL(check_silent):
-+	/* is either shift key held down? */
-+	movw	$(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
-+	andb	$3, (%bx)
-+	ret
-+
- notification_string:	.asciz "loading"
- 
- notification_step:	.asciz "."

=== removed file 'debian/patches/ubuntu_really_quiet.patch'
--- debian/patches/ubuntu_really_quiet.patch	2012-09-07 12:39:02 +0000
+++ debian/patches/ubuntu_really_quiet.patch	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-Description: Remove verbose messages printed before reading configuration
- In some ways this is awkward because it makes debugging harder, but it's a
- requirement for a smooth-looking boot process; we may be able to do better in
- future.  Upstream doesn't want this, though.
- .
- We disable the cursor as well, for similar reasons of tidiness.
-Author: Colin Watson <[e-mail]>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/386922
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/861048
-Forwarded: not-needed
-Last-Update: 2012-09-06
-
-Index: b/grub-core/kern/main.c
-===================================================================
---- a/grub-core/kern/main.c
-+++ b/grub-core/kern/main.c
-@@ -207,13 +207,14 @@
- void __attribute__ ((noreturn))
- grub_main (void)
- {
-+  struct grub_term_output *term;
-+
-   /* First of all, initialize the machine.  */
-   grub_machine_init ();
- 
--  /* Hello.  */
--  grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
--  grub_printf ("Welcome to GRUB!\n\n");
--  grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
-+  /* Disable the cursor until we need it.  */
-+  FOR_ACTIVE_TERM_OUTPUTS(term)
-+    grub_term_setcursor (term, 0);
- 
-   /* Load pre-loaded modules and free the space.  */
-   grub_register_exported_symbols ();
-@@ -232,5 +233,10 @@
- 
-   grub_load_config ();
-   grub_load_normal_mode ();
-+
-+  /* If we have to enter rescue mode, enable the cursor again.  */
-+  FOR_ACTIVE_TERM_OUTPUTS(term)
-+    grub_term_setcursor (term, 1);
-+
-   grub_rescue_run ();
- }
-Index: b/grub-core/kern/rescue_reader.c
-===================================================================
---- a/grub-core/kern/rescue_reader.c
-+++ b/grub-core/kern/rescue_reader.c
-@@ -77,8 +77,6 @@
- void __attribute__ ((noreturn))
- grub_rescue_run (void)
- {
--  grub_printf ("Entering rescue mode...\n");
--
-   while (1)
-     {
-       char *line;
-Index: b/grub-core/normal/menu.c
-===================================================================
---- a/grub-core/normal/menu.c
-+++ b/grub-core/normal/menu.c
-@@ -669,12 +669,9 @@
- 
- /* Callback invoked immediately before a menu entry is executed.  */
- static void
--notify_booting (grub_menu_entry_t entry,
-+notify_booting (grub_menu_entry_t entry __attribute__((unused)),
- 		void *userdata __attribute__((unused)))
- {
--  grub_printf ("  ");
--  grub_printf_ (N_("Booting `%s'"), entry->title);
--  grub_printf ("\n\n");
- }
- 
- /* Callback invoked when a default menu entry executed because of a timeout

=== modified file 'debian/patches/ubuntu_recovery_nomodeset.patch'
--- debian/patches/ubuntu_recovery_nomodeset.patch	2013-02-01 17:45:21 +0000
+++ debian/patches/ubuntu_recovery_nomodeset.patch	2013-10-08 00:15:07 +0000
@@ -10,7 +10,7 @@
 ===================================================================
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -134,7 +134,9 @@
+@@ -138,7 +138,9 @@
  	  echo "	load_video" | sed "s/^/$submenu_indentation/"
        fi
    fi
@@ -21,7 +21,7 @@
  
    echo "	insmod gzio" | sed "s/^/$submenu_indentation/"
  
-@@ -322,10 +324,10 @@
+@@ -326,10 +328,10 @@
    if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
      if [ -x /lib/recovery-mode/recovery-menu ]; then
        linux_entry "${OS}" "${version}" recovery \

=== removed file 'debian/patches/ubuntu_sleep_shift.patch'
--- debian/patches/ubuntu_sleep_shift.patch	2012-09-07 12:39:02 +0000
+++ debian/patches/ubuntu_sleep_shift.patch	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-Description: Allow Shift to interrupt 'sleep --interruptible'
- Upstream would like to consider this at more length. See
- http://lists.gnu.org/archive/html/grub-devel/2009-08/msg00718.html, and the
- rest of the thread for context.
-Author: Colin Watson <[e-mail]>
-Forwarded: http://lists.gnu.org/archive/html/grub-devel/2009-08/msg00694.html
-Last-Update: 2012-09-06
-
-Index: b/grub-core/commands/sleep.c
-===================================================================
---- a/grub-core/commands/sleep.c
-+++ b/grub-core/commands/sleep.c
-@@ -46,6 +46,31 @@
-   grub_refresh ();
- }
- 
-+static int
-+grub_check_keyboard (void)
-+{
-+  int mods = 0;
-+  grub_term_input_t term;
-+
-+  if (grub_term_poll_usb)
-+    grub_term_poll_usb ();
-+
-+  FOR_ACTIVE_TERM_INPUTS(term)
-+  {
-+    if (term->getkeystatus)
-+      mods |= term->getkeystatus (term);
-+  }
-+
-+  if (mods >= 0 &&
-+      (mods & (GRUB_TERM_STATUS_LSHIFT | GRUB_TERM_STATUS_RSHIFT)) != 0)
-+    return 1;
-+
-+  if (grub_getkey_noblock () == GRUB_TERM_ESC)
-+    return 1;
-+
-+  return 0;
-+}
-+
- /* Based on grub_millisleep() from kern/generic/millisleep.c.  */
- static int
- grub_interruptible_millisleep (grub_uint32_t ms)
-@@ -55,7 +80,7 @@
-   start = grub_get_time_ms ();
- 
-   while (grub_get_time_ms () - start < ms)
--    if (grub_getkey_noblock () == GRUB_TERM_ESC)
-+    if (grub_check_keyboard ())
-       return 1;
- 
-   return 0;

=== modified file 'debian/patches/ubuntu_vt_handoff.patch'
--- debian/patches/ubuntu_vt_handoff.patch	2013-02-01 17:45:21 +0000
+++ debian/patches/ubuntu_vt_handoff.patch	2013-10-08 00:15:07 +0000
@@ -12,7 +12,7 @@
 ===================================================================
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -82,6 +82,12 @@
+@@ -86,6 +86,12 @@
  
  title_correction_code=
  
@@ -25,7 +25,7 @@
  # add crashkernel option if we have the required tools
  if [ -x "/usr/bin/makedumpfile" ] && [ -x "/sbin/kexec" ]; then
      GRUB_CMDLINE_EXTRA="$GRUB_CMDLINE_EXTRA crashkernel=384M-2G:64M,2G-:128M"
-@@ -128,7 +134,7 @@
+@@ -132,7 +138,7 @@
  	  echo "	load_video" | sed "s/^/$submenu_indentation/"
        fi
    fi
@@ -34,7 +34,7 @@
  
    echo "	insmod gzio" | sed "s/^/$submenu_indentation/"
  
-@@ -200,6 +206,17 @@
+@@ -204,6 +210,17 @@
  boot_device_id=
  title_correction_code=
  

=== removed file 'debian/patches/ubuntu_wubi_no_windows.patch'
--- debian/patches/ubuntu_wubi_no_windows.patch	2012-09-07 12:39:02 +0000
+++ debian/patches/ubuntu_wubi_no_windows.patch	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-Description: Skip Windows os-prober entries on Wubi systems
- Since we're already being booted from the Windows boot loader, including
- entries that take us back to it mostly just causes confusion, and stops us
- from being able to hide the menu if there are no other OSes installed.
- .
- https://blueprints.launchpad.net/ubuntu/+spec/foundations-o-wubi
-Author: Colin Watson <[e-mail]>
-Forwarded: not-needed
-Last-Update: 2012-09-06
-
-Index: b/util/grub.d/30_os-prober.in
-===================================================================
---- a/util/grub.d/30_os-prober.in
-+++ b/util/grub.d/30_os-prober.in
-@@ -165,6 +165,8 @@
- 
- used_osprober_linux_ids=
- 
-+wubi=
-+
- for OS in ${OSPROBED} ; do
-   DEVICE="`echo ${OS} | cut -d ':' -f 1`"
-   LONGNAME="`echo ${OS} | cut -d ':' -f 2 | tr '^' ' '`"
-@@ -180,6 +182,23 @@
-   case ${BOOT} in
-     chain)
- 
-+      case ${LONGNAME} in
-+	Windows*)
-+	  if [ -z "$wubi" ]; then
-+	    if [ -x /usr/share/lupin-support/grub-mkimage ] && \
-+	       /usr/share/lupin-support/grub-mkimage --test; then
-+	      wubi=yes
-+	    else
-+	      wubi=no
-+	    fi
-+	  fi
-+	  if [ "$wubi" = yes ]; then
-+	    echo "Skipping ${LONGNAME} on Wubi system" >&2
-+	    continue
-+	  fi
-+	  ;;
-+      esac
-+
-       found_other_os=1
- 	  onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
-       cat << EOF

=== added file 'debian/patches/wubi_no_windows.patch'
--- debian/patches/wubi_no_windows.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/wubi_no_windows.patch	2013-10-08 00:15:07 +0000
@@ -0,0 +1,47 @@
+Description: Skip Windows os-prober entries on Wubi systems
+ Since we're already being booted from the Windows boot loader, including
+ entries that take us back to it mostly just causes confusion, and stops us
+ from being able to hide the menu if there are no other OSes installed.
+ .
+ https://blueprints.launchpad.net/ubuntu/+spec/foundations-o-wubi
+Author: Colin Watson <[e-mail]>
+Forwarded: not-needed
+Last-Update: 2013-08-13
+
+Index: b/util/grub.d/30_os-prober.in
+===================================================================
+--- a/util/grub.d/30_os-prober.in
++++ b/util/grub.d/30_os-prober.in
+@@ -112,6 +112,8 @@
+ 
+ used_osprober_linux_ids=
+ 
++wubi=
++
+ for OS in ${OSPROBED} ; do
+   DEVICE="`echo ${OS} | cut -d ':' -f 1`"
+   LONGNAME="`echo ${OS} | cut -d ':' -f 2 | tr '^' ' '`"
+@@ -127,6 +129,23 @@
+   case ${BOOT} in
+     chain)
+ 
++      case ${LONGNAME} in
++	Windows*)
++	  if [ -z "$wubi" ]; then
++	    if [ -x /usr/share/lupin-support/grub-mkimage ] && \
++	       /usr/share/lupin-support/grub-mkimage --test; then
++	      wubi=yes
++	    else
++	      wubi=no
++	    fi
++	  fi
++	  if [ "$wubi" = yes ]; then
++	    echo "Skipping ${LONGNAME} on Wubi system" >&2
++	    continue
++	  fi
++	  ;;
++      esac
++
+ 	  onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
+       cat << EOF
+ menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --class os \$menuentry_id_option 'osprober-chain-$(grub_get_device_id "${DEVICE}")' {

=== added file 'debian/po/hu.po'
--- debian/po/hu.po	1970-01-01 00:00:00 +0000
+++ debian/po/hu.po	2013-10-08 00:15:07 +0000
@@ -0,0 +1,411 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Dr. Nagy Elemér Károly <[e-mail]>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: grub2\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-05-27 13:33+0100\n"
+"PO-Revision-Date: 2013-05-18 15:44+0200\n"
+"Last-Translator: Dr. Nagy Elemér Károly <[e-mail]>\n"
+"Language-Team: Hungarian <debian-l10n-hungarian@lists.d.o>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: UTF-8\n"
+"Plural-Forms: ???\n"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:2001
+msgid "Chainload from menu.lst?"
+msgstr "Továbbtöltsünk a menu.lst-ből?"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:2001
+msgid "GRUB upgrade scripts have detected a GRUB Legacy setup in /boot/grub."
+msgstr ""
+"A GRUB frissítő program észlelte, hogy régi GRUB beállítás van a /boot/grub-"
+"ban."
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:2001
+msgid ""
+"In order to replace the Legacy version of GRUB in your system, it is "
+"recommended that /boot/grub/menu.lst is adjusted to load a GRUB 2 boot image "
+"from your existing GRUB Legacy setup. This step can be automatically "
+"performed now."
+msgstr ""
+"A régi GRUB lecserélése érdekében javasolt, hogy a /boot/grub/menu.lst fájlt "
+"úgy módosítsuk, hogy egy GRUB2 betöltőképet töltsön be a régi GRUB. Ezt "
+"automatikusan elvégezhetjük most."
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:2001
+msgid ""
+"It's recommended that you accept chainloading GRUB 2 from menu.lst, and "
+"verify that the new GRUB 2 setup works before it is written to the MBR "
+"(Master Boot Record)."
+msgstr ""
+"Javaslom, hogy a menu.lst-ből töltsük tovább a GRUB 2-t, és ellenőrizzük, "
+"hogy működik-e az új GRUB 2 beállítása, mielőtt az MBR-be (Master Boot "
+"Record) írnánk"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:2001
+msgid ""
+"Whatever your decision, you can replace the old MBR image with GRUB 2 later "
+"by issuing the following command as root:"
+msgstr ""
+"Bárhogy is döntesz most, a régi MBR képet kicserélheted a GRUB2 "
+"betöltőképével, ha rendszergazdaként (root) kiadod a következő parancsot:"
+
+#. Type: multiselect
+#. Description
+#. Type: multiselect
+#. Description
+#: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+msgid "GRUB install devices:"
+msgstr "GRUB telepítési eszközök:"
+
+#. Type: multiselect
+#. Description
+#: ../grub-pc.templates.in:3001
+msgid ""
+"The grub-pc package is being upgraded. This menu allows you to select which "
+"devices you'd like grub-install to be automatically run for, if any."
+msgstr ""
+"A grub-pc csomagot frissítjük. Ebben a menüben kiválaszthatod, hogy melyik "
+"egységekre szeretnéd automatikusan futtatni a grub-install parancsot, ha van "
+"ilyen."
+
+#. Type: multiselect
+#. Description
+#: ../grub-pc.templates.in:3001
+msgid ""
+"Running grub-install automatically is recommended in most situations, to "
+"prevent the installed GRUB core image from getting out of sync with GRUB "
+"modules or grub.cfg."
+msgstr ""
+"A grub-install automatikus futtatása erősen javasolt a legtöbb esetben, mert "
+"megakadályozza, hogy a GRUB töltőkép más verziójú legyen, mint a GRUB "
+"modulok vagy a grub.cfg fájl."
+
+#. Type: multiselect
+#. Description
+#. Type: multiselect
+#. Description
+#: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+msgid ""
+"If you're unsure which drive is designated as boot drive by your BIOS, it is "
+"often a good idea to install GRUB to all of them."
+msgstr ""
+"Ha nem vagy benne biztos, hogy melyik meghajtó van rendszerlemeznek "
+"beállítva a BIOS-ban, jó ötlet lehet mindegyikre feltelepíteni a GRUB-ot."
+
+#. Type: multiselect
+#. Description
+#. Type: multiselect
+#. Description
+#: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+msgid ""
+"Note: it is possible to install GRUB to partition boot records as well, and "
+"some appropriate partitions are offered here. However, this forces GRUB to "
+"use the blocklist mechanism, which makes it less reliable, and therefore is "
+"not recommended."
+msgstr ""
+"Megjegyzés: A GRUB-ot nemcsak lemez, de partíció rendszerbetöltő részére is "
+"lehet telepíteni, és ha van erre alkalmas partíció, azt is felkínáljuk itt. "
+"Mivel azonban így a GRUB kénytelen a blokklista módszert (blocklist) "
+"alkalmazni, amely kevésbé megbízható, így ez nem javasolt."
+
+#. Type: multiselect
+#. Description
+#: ../grub-pc.templates.in:4001
+msgid ""
+"The GRUB boot loader was previously installed to a disk that is no longer "
+"present, or whose unique identifier has changed for some reason. It is "
+"important to make sure that the installed GRUB core image stays in sync with "
+"GRUB modules and grub.cfg. Please check again to make sure that GRUB is "
+"written to the appropriate boot devices."
+msgstr ""
+"A GRUB rendszerbetöltő korábban egy olyan lemezre volt telepítve, amely "
+"hiányzik vagy amelynek megváltozott az egyedi azonosítója. Fontos, hogy "
+"biztosítsuk, hogy a GRUB töltőkép ugyanolyan verziójú legyen, mint a GRUB "
+"modulok és a grub.cfg. Kérlek ellenőrizd még egyszer hogy biztosan a "
+"megfelelő eszközre írjuk a GRUB-ot."
+
+#. Type: text
+#. Description
+#. Disk sizes are in decimal megabytes, to match how disk manufacturers
+#. usually describe them.
+#: ../grub-pc.templates.in:5001
+msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: text
+#. Description
+#. The "-" is used to indicate indentation. Leading spaces may not work.
+#: ../grub-pc.templates.in:6001
+msgid "- ${DEVICE} (${SIZE} MB; ${PATH})"
+msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:7001
+msgid "Writing GRUB to boot device failed - continue?"
+msgstr "Nem sikerül a GRUB-ot a rendszerlemezre írni - folytassuk?"
+
+#. Type: boolean
+#. Description
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+msgid "GRUB failed to install to the following devices:"
+msgstr "Nem sikerült a GRUB-ot a következő eszközökre telepíteni:"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:7001
+msgid ""
+"Do you want to continue anyway? If you do, your computer may not start up "
+"properly."
+msgstr ""
+"Ennek ellenére folytatni akarod? Ha folytatod, lehet, hogy a számítógéped "
+"nem fog elindulni."
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:8001
+msgid "Writing GRUB to boot device failed - try again?"
+msgstr "Nem sikerül a GRUB-ot a rendszerlemezre írni - megpróbáljuk újra?"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:8001
+msgid ""
+"You may be able to install GRUB to some other device, although you should "
+"check that your system will boot from that device. Otherwise, the upgrade "
+"from GRUB Legacy will be canceled."
+msgstr ""
+"Megpróbálhatod egy másik eszközre telepíteni a GRUB-ot, de ehhez célszerű "
+"ellenőrizni, hogy az adott eszközről el tud-e indulni a rendszer. Egyébként "
+"a régi GRUB frissítését visszavonjuk."
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:9001
+msgid "Continue without installing GRUB?"
+msgstr "GRUB telepítése nélkül folytassuk:"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:9001
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously in the boot sector. If there is an "
+"earlier version of GRUB 2 in the boot sector, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Úgy döntöttél, hogy ne telepítsük a GRUB-ot egyetlen eszközre sem. Ha "
+"folytatod, lehet, hogy nem lesz jól beállítva a rendszerbetöltőd és a "
+"számítógéped következő indulásakor az fog elindulni, ami korábban a "
+"rendszerbetöltő szektorban volt. Ha ebben a GRUB 2 egy régebbi verziója van, "
+"lehet, hogy nem tudja majd betölteni a moduljait vagy nem lesz képes "
+"értelmezni a jelenlegi konfigurációs fájlt."
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:9001
+msgid ""
+"If you are already using a different boot loader and want to carry on doing "
+"so, or if this is a special environment where you do not need a boot loader, "
+"then you should continue anyway. Otherwise, you should install GRUB "
+"somewhere."
+msgstr ""
+"Ha már egy másik rendszerbetöltőt használsz és annál maradnál, vagy ha olyan "
+"különleges környezetben dolgozol, ahol nincs szükséged rendszerbetöltőre, "
+"folytathatod. Minden más esetben valahová telepítened kellene a GRUB-ot."
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:10001
+msgid "Remove GRUB 2 from /boot/grub?"
+msgstr "Kiszedjem a GRUB 2-t a /boot/grub-ból?"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:10001
+msgid "Do you want to have all GRUB 2 files removed from /boot/grub?"
+msgstr "Azt szeretnéd, hogy minden GRUB 2 fájlt kiszedjek a /boot/grub-ból?"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:10001
+msgid ""
+"This will make the system unbootable unless another boot loader is installed."
+msgstr ""
+"Ezzel a rendszert indulásra képtelen állapotba hozod, hacsak nem telepítesz "
+"másik rendszerbetöltőt."
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:11001
+msgid "Finish conversion to GRUB 2 now?"
+msgstr "Befejezed most az átállást a GRUB 2-re?"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:11001
+msgid ""
+"This system still has files from the GRUB Legacy boot loader installed, but "
+"it now also has GRUB 2 boot records installed on these disks:"
+msgstr ""
+"Ezen a rendszeren még mindig vannak a régi GRUB rendszerbetöltőhöz tartozó "
+"fájlok, de a következő lemezeken már a GRUB 2 rendszerbetöltő van telepítve:"
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:11001
+msgid ""
+"It seems likely that GRUB Legacy is no longer in use, and that you should "
+"instead upgrade the GRUB 2 images on these disks and finish the conversion "
+"to GRUB 2 by removing old GRUB Legacy files. If you do not upgrade these "
+"GRUB 2 images, then they may be incompatible with the new packages and cause "
+"your system to stop booting properly."
+msgstr ""
+"Úgy tűnik, hogy a régi GRUB már nincs használatban és hogy jobb lenne, ha a "
+"GRUB 2 betöltőképekre frissítenénk ezeket a lemezeket és ha a régi GRUB "
+"fájlok eltávolításával befejeznénk az áttérést a GRUB 2-re. Ha nem frissíted "
+"ezeket a GRUB2 betöltőképeket, akkor inkompatibilisek lehetnek az új "
+"csomagokkal és lehet, hogy nem fog elindulni a rendszer."
+
+#. Type: boolean
+#. Description
+#: ../grub-pc.templates.in:11001
+msgid ""
+"You should generally finish the conversion to GRUB 2 unless these boot "
+"records were created by a GRUB 2 installation on some other operating system."
+msgstr ""
+"Általában célszerű befejezni a GRUB 2-re áttérést, kivéve ha ezek a "
+"rendszerbetöltő rekordok egy másik operációs rendszeren futó GRUB 2 "
+"telepítéssel készültek."
+
+#. Type: string
+#. Description
+#: ../templates.in:1001
+msgid "Linux command line:"
+msgstr "Linux parancssor:"
+
+#. Type: string
+#. Description
+#: ../templates.in:1001
+msgid ""
+"The following Linux command line was extracted from /etc/default/grub or the "
+"`kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
+"correct, and modify it if necessary. The command line is allowed to be empty."
+msgstr ""
+"A következő Linux parancssor az /etc/default/grub vagy a régi GRUB menu.lst "
+"fájljában lévő `kopt' paraméterből származik. Kérlek ellenőrizd, hogy helyes-"
+"e, és módosítsd, ha szükséges. A parancssor lehet üres is."
+
+#. Type: string
+#. Description
+#: ../templates.in:2001
+msgid "Linux default command line:"
+msgstr "Az alapértelmezett Linux parancssor:"
+
+#. Type: string
+#. Description
+#: ../templates.in:2001
+msgid ""
+"The following string will be used as Linux parameters for the default menu "
+"entry but not for the recovery mode."
+msgstr ""
+"A következő sort fogjuk Linux paraméternek használni az alapértelmezett "
+"(default) menüben, de a rendszervisszaállító (recovery) módban nem."
+
+#. Type: string
+#. Description
+#: ../templates.in:3001
+msgid "kFreeBSD command line:"
+msgstr "kFreeBSD parancssor:"
+
+#. Type: string
+#. Description
+#: ../templates.in:3001
+msgid ""
+"The following kFreeBSD command line was extracted from /etc/default/grub or "
+"the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
+"correct, and modify it if necessary. The command line is allowed to be empty."
+msgstr ""
+"A következő kFreeBSD parancssor az /etc/default/grub vagy a régi GRUB menu."
+"lst fájljában lévő `kopt' paraméterből származik. Kérlek ellenőrizd, hogy "
+"helyes-e, és módosítsd, ha szükséges. A parancssor lehet üres is."
+
+#. Type: string
+#. Description
+#: ../templates.in:4001
+msgid "kFreeBSD default command line:"
+msgstr "Az alapértelmezett kFreeBSD parancssor:"
+
+#. Type: string
+#. Description
+#: ../templates.in:4001
+msgid ""
+"The following string will be used as kFreeBSD parameters for the default "
+"menu entry but not for the recovery mode."
+msgstr ""
+"A következő sort fogjuk kFreeBSD paraméternek használni az alapértelmezett "
+"(default) menüben, de a rendszervisszaállító (recovery) módban nem."
+
+#. Type: note
+#. Description
+#: ../templates.in:5001
+msgid "/boot/grub/device.map has been regenerated"
+msgstr "A /boot/grub/device.map fájlt újraépítettem."
+
+#. Type: note
+#. Description
+#: ../templates.in:5001
+msgid ""
+"The file /boot/grub/device.map has been rewritten to use stable device "
+"names. In most cases, this should significantly reduce the need to change it "
+"in future, and boot menu entries generated by GRUB should not be affected."
+msgstr ""
+"A /boot/grub/device.map fájlt újraírtam, így már stabil eszköznevek "
+"szerepelnek benn. A legtöbb esetben ez jelentősen csökkenti a szükséges "
+"változtatások számát a jövőben, és a GRUB által készített menüpontoknak "
+"ettől nem kéne megváltozniuk változniuk."
+
+#. Type: note
+#. Description
+#: ../templates.in:5001
+msgid ""
+"However, since more than one disk is present in the system, it is possible "
+"that the system is depending on the old device map. Please check whether "
+"there are any custom boot menu entries that rely on GRUB's (hdN) drive "
+"numbering, and update them if necessary."
+msgstr ""
+"Mivel azonban egynél több lemez van a rendszervben, lehetséges, hogy a "
+"rendszernek szüksége van a régi eszköztérképre. Kérelk ellenőrizd, hogy van-"
+"e olyan saját készítésű rendszerbetöltő menüpontod amelyik a GRUB (hdN) "
+"eszközszámozását használja, és frissítsd, ha szükséges."
+
+#. Type: note
+#. Description
+#: ../templates.in:5001
+msgid ""
+"If you do not understand this message, or if there are no custom boot menu "
+"entries, you can ignore this message."
+msgstr ""
+"Ha nem érted ezt az üzenetet, vagy ha nem csináltal saját készítésű "
+"rendszerbetöltő menüpontot, ne is törődj vele, lépj tovább."

=== modified file 'debian/postinst.in'
--- debian/postinst.in	2013-01-29 05:52:31 +0000
+++ debian/postinst.in	2013-10-08 00:15:07 +0000
@@ -284,11 +284,10 @@
 {
   for x in /etc/default/grub /etc/default/grub.d/*.cfg; do
     if [ -e "$x" ]; then
-      DEFAULT_FOUND="yes"
       . "$x"
     fi
   done
-  if [ "$DEFAULT_FOUND" = "yes" ]; then
+  if [ "$(eval echo "\${$1+set}")" = set ]; then
     eval echo "\$$1"
   else
     return
@@ -697,7 +696,7 @@
       ;;
 
       grub-yeeloong)
-        grub-install
+        grub-install --target=mipsel-loongson
       ;;
     esac
 

=== modified file 'debian/rules'
--- debian/rules	2013-02-01 17:45:21 +0000
+++ debian/rules	2013-10-08 00:15:07 +0000
@@ -35,7 +35,7 @@
 
 confflags = PACKAGE_VERSION="$(deb_version)" PACKAGE_STRING="GRUB $(deb_version)" CC=$(CC) TARGET_CC=$(CC) --enable-grub-mkfont
 
-AUTOGEN_DEB_FILES = config templates preinst postinst postrm dirs install links
+AUTOGEN_DEB_FILES = config templates preinst postinst postrm dirs install links maintscript
 
 BUILD_PACKAGES := $(strip $(shell dh_listpackages))
 REAL_PACKAGES = grub-emu grub-pc grub-coreboot grub-efi-ia32 grub-efi-amd64 grub-efi-ia64 grub-ieee1275 grub-firmware-qemu grub-yeeloong
@@ -54,10 +54,20 @@
 
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 DEFAULT_CMDLINE := quiet splash
+confflags += --enable-quiet-boot
 else
 DEFAULT_CMDLINE := quiet
 endif
 
+SB_PACKAGE :=
+ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
+ifeq ($(DEB_HOST_ARCH),amd64)
+SB_PACKAGE := grub-efi-amd64
+SB_PLATFORM := x86_64-efi
+SB_EFI_NAME := x64
+endif
+endif
+
 %:
 	dh $@ --parallel
 
@@ -325,6 +335,9 @@
 override_dh_installinit:
 	dh_installinit -- start 99 2 3 4 5 .
 
+override_dh_bugfiles:
+	dh_bugfiles -A
+
 override_dh_strip:
 	dh_strip -X/usr/bin/grub-emu
 
@@ -344,19 +357,17 @@
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
-ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
-ifeq ($(DEB_HOST_ARCH),amd64)
+ifneq (,$(SB_PACKAGE))
 	debian/build-efi-images \
 		build/grub-$(COMMON_PLATFORM)/grub-mkimage \
-		build/grub-efi-amd64/grub-core \
+		build/$(SB_PACKAGE)/grub-core \
 		debian/grub2-images/$(deb_version) \
-		x86_64-efi x64
+		$(SB_PLATFORM) $(SB_EFI_NAME)
 	echo $(deb_version) \
 		> debian/grub2-images/$(deb_version)/version
 	cd debian/grub2-images && tar czvf ../../../$(TARNAME) .
 	dpkg-distaddfile $(TARNAME) raw-uefi -
 endif
-endif
 
 override_dh_auto_clean:
 	-rm -rf build
@@ -366,17 +377,15 @@
 	dh_autoreconf_clean
 	dh_clean
 
-	chmod +x debian/{script,grub.d/*,legacy/*,kernel/*}
+	chmod +x debian/{bug-script,grub.d/*,legacy/*,kernel/*}
 
 	for i in $(AUTOGEN_DEB_FILES) ; do \
 		rm -f debian/grub-{pc,efi-*,ieee1275,coreboot,yeeloong,emu}{,-bin,-dbg}.$$i ; \
 	done
 	rm -rf debian/tmp-*/
-ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
-ifeq ($(DEB_HOST_ARCH),amd64)
+ifneq (,$(SB_PACKAGE))
 	rm -rf debian/grub2-images
 endif
-endif
 
 	# make sure PO files are always up-to-date
 	debconf-updatepo

=== modified file 'docs/grub-dev.texi'
--- docs/grub-dev.texi	2012-05-22 07:15:28 +0000
+++ docs/grub-dev.texi	2013-10-08 00:15:07 +0000
@@ -1394,8 +1394,8 @@
 
 @node Bitmap API
 @section Bitmap API
-@itemize
 @subsection grub_video_bitmap_create
+@itemize
 @item Prototype:
 @example
 grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format)

=== modified file 'grub-core/boot/i386/pc/boot.S'
--- grub-core/boot/i386/pc/boot.S	2012-09-07 12:39:02 +0000
+++ grub-core/boot/i386/pc/boot.S	2013-10-08 00:15:07 +0000
@@ -18,8 +18,10 @@
  */
 
 #include <grub/symbol.h>
+#include <grub/machine/boot.h>
+#ifdef QUIET_BOOT
 #include <grub/machine/memory.h>
-#include <grub/machine/boot.h>
+#endif
 
 /*
  *  defines for the code go here
@@ -151,10 +153,12 @@
 	/* save drive reference first thing! */
 	pushw	%dx
 
+#ifdef QUIET_BOOT
 	/* is either shift key held down? */
 	movw	$(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
 	andb	$3, (%bx)
 	jz	2f
+#endif
 
 	/* print a notification message on the screen */
 	MSG(notification_string)

=== modified file 'grub-core/boot/i386/pc/diskboot.S'
--- grub-core/boot/i386/pc/diskboot.S	2012-09-07 12:39:02 +0000
+++ grub-core/boot/i386/pc/diskboot.S	2013-10-08 00:15:07 +0000
@@ -17,15 +17,22 @@
  */
 
 #include <grub/symbol.h>
+#include <grub/machine/boot.h>
+#ifdef QUIET_BOOT
 #include <grub/machine/memory.h>
-#include <grub/machine/boot.h>
+#endif
 
 /*
  *  defines for the code go here
  */
 
 #define MSG(x)	movw $x, %si; call LOCAL(message)
+
+#ifdef QUIET_BOOT
 #define SILENT(x)	call LOCAL(check_silent); jz LOCAL(x)
+#else
+#define SILENT(x)
+#endif
 
 	.file	"diskboot.S"
 
@@ -331,11 +338,13 @@
 /* go here when you need to stop the machine hard after an error condition */
 LOCAL(stop):	jmp	LOCAL(stop)
 
+#ifdef QUIET_BOOT
 LOCAL(check_silent):
 	/* is either shift key held down? */
 	movw	$(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
 	andb	$3, (%bx)
 	ret
+#endif
 
 notification_string:	.asciz "loading"
 

=== modified file 'grub-core/disk/efi/efidisk.c'
--- grub-core/disk/efi/efidisk.c	2012-06-09 08:43:24 +0000
+++ grub-core/disk/efi/efidisk.c	2013-10-08 00:15:07 +0000
@@ -668,9 +668,11 @@
 		&& (GRUB_EFI_DEVICE_PATH_SUBTYPE (c->last_device_path)
 		    == GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE)
 		&& (grub_partition_get_start (disk->partition)
-		    == hd.partition_start)
+		    == (hd.partition_start << (disk->log_sector_size
+					       - GRUB_DISK_SECTOR_BITS)))
 		&& (grub_partition_get_len (disk->partition)
-		    == hd.partition_size))
+		    == (hd.partition_size << (disk->log_sector_size
+					      - GRUB_DISK_SECTOR_BITS))))
 	      {
 		handle = c->handle;
 		return 1;
@@ -763,11 +765,14 @@
       auto int find_partition (grub_disk_t disk, const grub_partition_t part);
 
       /* Find the identical partition.  */
-      int find_partition (grub_disk_t disk __attribute__ ((unused)),
-			  const grub_partition_t part)
+      int find_partition (grub_disk_t disk, const grub_partition_t part)
 	{
-	  if (grub_partition_get_start (part) == hd.partition_start
-	      && grub_partition_get_len (part) == hd.partition_size)
+	  if (grub_partition_get_start (part)
+	      == (hd.partition_start << (disk->log_sector_size
+					 - GRUB_DISK_SECTOR_BITS))
+	      && grub_partition_get_len (part)
+	      == (hd.partition_size << (disk->log_sector_size
+					- GRUB_DISK_SECTOR_BITS)))
 	    {
 	      partition_name = grub_partition_get_name (part);
 	      return 1;
@@ -799,7 +804,9 @@
       /* Find a partition which matches the hard drive device path.  */
       grub_memcpy (&hd, ldp, sizeof (hd));
       if (hd.partition_start == 0
-	  && hd.partition_size == grub_disk_get_size (parent))
+	  && (hd.partition_size << (parent->log_sector_size
+				    - GRUB_DISK_SECTOR_BITS))
+	      == grub_disk_get_size (parent))
 	{
 	  dev_name = grub_strdup (parent->name);
 	}

=== modified file 'grub-core/kern/main.c'
--- grub-core/kern/main.c	2012-09-07 12:39:02 +0000
+++ grub-core/kern/main.c	2013-10-08 00:15:07 +0000
@@ -207,14 +207,23 @@
 void __attribute__ ((noreturn))
 grub_main (void)
 {
+#ifdef QUIET_BOOT
   struct grub_term_output *term;
+#endif
 
   /* First of all, initialize the machine.  */
   grub_machine_init ();
 
+#ifdef QUIET_BOOT
   /* Disable the cursor until we need it.  */
   FOR_ACTIVE_TERM_OUTPUTS(term)
     grub_term_setcursor (term, 0);
+#else
+  /* Hello.  */
+  grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
+  grub_printf ("Welcome to GRUB!\n\n");
+  grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
+#endif
 
   /* Load pre-loaded modules and free the space.  */
   grub_register_exported_symbols ();
@@ -234,9 +243,11 @@
   grub_load_config ();
   grub_load_normal_mode ();
 
+#ifdef QUIET_BOOT
   /* If we have to enter rescue mode, enable the cursor again.  */
   FOR_ACTIVE_TERM_OUTPUTS(term)
     grub_term_setcursor (term, 1);
+#endif
 
   grub_rescue_run ();
 }

=== modified file 'grub-core/kern/rescue_reader.c'
--- grub-core/kern/rescue_reader.c	2012-09-07 12:39:02 +0000
+++ grub-core/kern/rescue_reader.c	2013-10-08 00:15:07 +0000
@@ -77,6 +77,10 @@
 void __attribute__ ((noreturn))
 grub_rescue_run (void)
 {
+#ifdef QUIET_BOOT
+  grub_printf ("Entering rescue mode...\n");
+#endif
+
   while (1)
     {
       char *line;

=== modified file 'grub-core/normal/main.c'
--- grub-core/normal/main.c	2012-09-07 12:39:02 +0000
+++ grub-core/normal/main.c	2013-10-08 00:15:07 +0000
@@ -399,6 +399,7 @@
 grub_normal_read_line_real (char **line, int cont, int nested)
 {
   const char *prompt;
+#ifdef QUIET_BOOT
   static int displayed_intro;
 
   if (! displayed_intro)
@@ -406,6 +407,7 @@
       grub_normal_reader_init (nested);
       displayed_intro = 1;
     }
+#endif
 
   if (cont)
     /* TRANSLATORS: it's command line prompt.  */
@@ -453,6 +455,10 @@
       return;
     }
 
+#ifndef QUIET_BOOT
+  grub_normal_reader_init (nested);
+#endif
+
   while (1)
     {
       char *line;

=== modified file 'grub-core/normal/menu.c'
--- grub-core/normal/menu.c	2012-09-07 12:39:02 +0000
+++ grub-core/normal/menu.c	2013-10-08 00:15:07 +0000
@@ -669,9 +669,18 @@
 
 /* Callback invoked immediately before a menu entry is executed.  */
 static void
-notify_booting (grub_menu_entry_t entry __attribute__((unused)),
+notify_booting (grub_menu_entry_t entry
+#ifdef QUIET_BOOT
+		__attribute__((unused))
+#endif
+		,
 		void *userdata __attribute__((unused)))
 {
+#ifndef QUIET_BOOT
+  grub_printf ("  ");
+  grub_printf_ (N_("Booting `%s'"), entry->title);
+  grub_printf ("\n\n");
+#endif
 }
 
 /* Callback invoked when a default menu entry executed because of a timeout
@@ -719,7 +728,9 @@
       int boot_entry;
       grub_menu_entry_t e;
       int auto_boot;
+#ifdef QUIET_BOOT
       int initial_timeout = grub_menu_get_timeout ();
+#endif
 
       boot_entry = run_menu (menu, nested, &auto_boot);
       if (boot_entry < 0)
@@ -729,8 +740,10 @@
       if (! e)
 	continue; /* Menu is empty.  */
 
+#ifdef QUIET_BOOT
       /* Only clear the screen if we drew the menu in the first place.  */
       if (initial_timeout != 0)
+#endif
 	grub_cls ();
 
       if (auto_boot)

=== added file 'tests/grub_script_no_commands.in'
--- tests/grub_script_no_commands.in	1970-01-01 00:00:00 +0000
+++ tests/grub_script_no_commands.in	2013-10-08 00:15:07 +0000
@@ -0,0 +1,21 @@
+#! /bin/sh
+set -e
+
+# grub-script-check refuses to pass a file with no commands; this usually
+# indicates a bug in the code generating that file.
+
+@builddir@/grub-script-check <<EOF && exit 1
+
+EOF
+
+@builddir@/grub-script-check <<EOF && exit 1
+# comment
+EOF
+
+@builddir@/grub-script-check <<EOF && exit 1
+# comment 1
+# comment 2
+
+EOF
+
+exit 0

=== modified file 'util/deviceiter.c'
--- util/deviceiter.c	2012-09-05 13:02:04 +0000
+++ util/deviceiter.c	2013-10-08 00:15:07 +0000
@@ -913,7 +913,7 @@
 	      dmraid_check (node_name, "dm_tree_node_get_name failed\n");
 	      node_uuid = dm_tree_node_get_uuid (second);
 	      dmraid_check (node_uuid, "dm_tree_node_get_uuid failed\n");
-	      if (strncmp (node_uuid, "DMRAID-", 7) != 0)
+	      if (strstr (node_uuid, "DMRAID-") == 0)
 		{
 		  grub_dprintf ("deviceiter", "%s is not DM-RAID\n", node_name);
 		  goto dmraid_next_child;

=== modified file 'util/getroot.c'
--- util/getroot.c	2012-09-26 16:27:19 +0000
+++ util/getroot.c	2013-10-08 00:15:07 +0000
@@ -2322,6 +2322,7 @@
 	    grub_util_warn
 	      (_("disk does not exist, so falling back to partition device %s"),
 	       os_dev);
+	    grub_errno = GRUB_ERR_NONE;
 
 	    canon = canonicalize_file_name (os_dev);
 	    drive = find_system_device (canon ? : os_dev, &st, 0, 1);

=== modified file 'util/grub-install.in'
--- util/grub-install.in	2013-02-01 17:45:21 +0000
+++ util/grub-install.in	2013-10-08 00:15:07 +0000
@@ -63,12 +63,7 @@
 
 removable=no
 efi_quiet=
-sb_var=/sys/firmware/efi/vars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c/data
-if [ -e "$sb_var" ] && [ "$(printf %x \'"$(cat "$sb_var")")" = 1 ]; then
-  uefi_secure_boot=yes
-else
-  uefi_secure_boot=no
-fi
+uefi_secure_boot=yes
 
 # Get GRUB_DISTRIBUTOR.
 if test -f "${sysconfdir}/default/grub" ; then
@@ -368,6 +363,9 @@
 
 if test "x$grub_setup" = x && [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-pc" ]; then
     grub_setup="${sbindir}/`echo grub-bios-setup | sed ${transform}`"
+    if [ ! -e "$grub_setup" ]; then
+	grub_setup="${source_dir}/`echo grub-bios-setup | sed ${transform}`"
+    fi
 fi
 
 if test "x$grub_setup" = x && [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "sparc64-ieee1275" ]; then
@@ -850,10 +848,16 @@
 	else
 	    cp "$efi_signed" "${efidir}/${efi_file}"
 	fi
-	if [ x"$config_opt_file" != x ]; then
-	    cp "${config_opt_file}" "${efidir}/grub.cfg"
-	    echo 'configfile $prefix/grub.cfg' >> "${efidir}/grub.cfg"
+	if [ x"$config_opt_file" = x ]; then
+	    # So we have a device abstraction; we don't need to search for
+	    # the root, but we do need to tell grub where it is.
+	    hints="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=efi_hints --device`"
+	    echo "set root=$hints" >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
+	    echo 'set prefix=($root)'"$(echo "${relative_grubdir}" | sed "s,\\([ \"'\\\\]\\),\\\\\\1,g")" >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
+	    config_opt_file="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
 	fi
+	cp "${config_opt_file}" "${efidir}/grub.cfg"
+	echo 'configfile $prefix/grub.cfg' >> "${efidir}/grub.cfg"
     else
 	cp "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" "${efidir}/${efi_file}"
 	# For old macs. Suggested by Peter Jones.

=== modified file 'util/grub-mkconfig.in'
--- util/grub-mkconfig.in	2013-01-03 11:40:01 +0000
+++ util/grub-mkconfig.in	2013-10-08 00:15:07 +0000
@@ -254,7 +254,7 @@
     # emacsen backup files. FIXME: support other editors
     *~) ;;
     # emacsen autosave files. FIXME: support other editors
-    \#*\#) ;;
+    */\#*\#) ;;
     *)
       if grub_file_is_not_garbage "$i" && test -x "$i" ; then
         echo

=== modified file 'util/grub-script-check.c'
--- util/grub-script-check.c	2012-03-06 11:02:38 +0000
+++ util/grub-script-check.c	2013-10-08 00:15:07 +0000
@@ -92,7 +92,7 @@
   int lineno = 0;
   FILE *file = 0;
   struct arguments arguments;
-  int found_input = 0;
+  int found_input = 0, found_cmd = 0;
   struct grub_script *script = NULL;
 
   auto grub_err_t get_config_line (char **line, int cont);
@@ -177,6 +177,8 @@
       script = grub_script_parse (input, get_config_line);
       if (script)
 	{
+	  if (script->cmd)
+	    found_cmd = 1;
 	  grub_script_execute (script);
 	  grub_script_free (script);
 	}
@@ -191,6 +193,12 @@
       fprintf (stderr, _("Syntax error at line %u\n"), lineno);
       return 1;
     }
+  if (! found_cmd)
+    {
+      fprintf (stderr, _("Script contains no commands and will do nothing\n"),
+	       arguments.filename);
+      return 1;
+    }
 
   return 0;
 }

=== modified file 'util/grub.d/00_header.in'
--- util/grub.d/00_header.in	2012-09-07 12:39:02 +0000
+++ util/grub.d/00_header.in	2013-10-08 00:15:07 +0000
@@ -23,6 +23,7 @@
 exec_prefix="@exec_prefix@"
 datarootdir="@datarootdir@"
 grub_lang=`echo $LANG | cut -d . -f 1`
+grubdir="`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`"
 
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR="@localedir@"
@@ -90,7 +91,20 @@
 
 function recordfail {
   set recordfail=1
+EOF
+FS="$(grub-probe --target=fs "${grubdir}")"
+case "$FS" in
+  btrfs | cpiofs | newc | odc | romfs | squash4 | tarfs | zfs)
+    cat <<EOF
+  # GRUB lacks write support for $FS, so recordfail support is disabled.
+EOF
+    ;;
+  *)
+    cat <<EOF
   if [ -n "\${have_grubenv}" ]; then if [ -z "\${boot_once}" ]; then save_env recordfail; fi; fi
+EOF
+esac
+cat <<EOF
 }
 
 function load_video {

=== modified file 'util/grub.d/10_linux.in'
--- util/grub.d/10_linux.in	2013-02-01 17:45:21 +0000
+++ util/grub.d/10_linux.in	2013-10-08 00:15:07 +0000
@@ -20,6 +20,7 @@
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 datarootdir="@datarootdir@"
+quiet_boot="@QUIET_BOOT@"
 
 . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
 
@@ -31,11 +32,14 @@
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU/Linux
 else
-  if [ "${GRUB_DISTRIBUTOR}" = "Ubuntu" ] ; then
-    OS="${GRUB_DISTRIBUTOR}"
-  else
-    OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-  fi
+  case ${GRUB_DISTRIBUTOR} in
+    Ubuntu|Kubuntu)
+      OS="${GRUB_DISTRIBUTOR}"
+      ;;
+    *)
+      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+      ;;
+  esac
   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
 fi
 
@@ -151,7 +155,7 @@
     fi
     printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
   fi
-  if [ x$type != xsimple ]; then
+  if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
     message="$(gettext_printf "Loading Linux %s ..." ${version})"
     sed "s/^/$submenu_indentation/" << EOF
 	echo	'$(echo "$message" | grub_quote)'
@@ -168,7 +172,7 @@
   fi
   if test -n "${initrd}" ; then
     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
-    if [ x$type != xsimple ]; then
+    if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
       message="$(gettext_printf "Loading initial ramdisk ...")"
       sed "s/^/$submenu_indentation/" << EOF
 	echo	'$(echo "$message" | grub_quote)'

=== modified file 'util/grub.d/30_os-prober.in'
--- util/grub.d/30_os-prober.in	2012-09-26 16:27:19 +0000
+++ util/grub.d/30_os-prober.in	2013-10-08 00:15:07 +0000
@@ -91,6 +91,11 @@
   exit 0
 fi
 
+# Try to load the efivars module, in case it's needed for EFI support
+# to work below. Hide the errors in case it's not available, there is
+# no need to scare people here.
+modprobe efivars >/dev/null 2>&1 || true
+
 OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`"
 if [ -z "${OSPROBED}" ] ; then
   # empty os-prober output, nothing doing
@@ -222,6 +227,20 @@
 }
 EOF
     ;;
+    efi)
+      found_other_os=1
+      EFIPATH=${DEVICE#*@}
+      DEVICE=${DEVICE%@*}
+      cat << EOF
+menuentry "${LONGNAME} (UEFI on ${DEVICE})" --class windows --class os {
+EOF
+      save_default_entry | sed -e "s/^/\t/"
+      prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
+      cat <<EOF
+	chainloader ${EFIPATH}
+}
+EOF
+    ;;
     linux)
       LINUXPROBED="`linux-boot-prober ${DEVICE} 2> /dev/null | tr ' ' '^' | paste -s -d ' '`"
       prepare_boot_cache=