Adjust UEFI installation to cope with Kubuntu setting GRUB_DISTRIBUTOR (LP: #1242417).

debian/changelog

@@ -13,6 +13,8 @@ grub2 (2.00-20) UNRELEASED; urgency=low
       (Steve Langasek, LP: #1236625).
     - If MokManager is present on the host system, copy it onto the EFI boot
       partition for use (Steve Langasek).
+    - Adjust UEFI installation to cope with Kubuntu setting GRUB_DISTRIBUTOR
+      (LP: #1242417).
 
  -- Colin Watson <cjwatson@debian.org>  Mon, 07 Oct 2013 09:48:53 +0100
 

debian/patches/install_efi_ubuntu_flavours.patch

@@ -0,0 +1,24 @@
+Description: Cope with Kubuntu setting GRUB_DISTRIBUTOR
+ This is not a very good approach, and certainly not sanely upstreamable; we
+ probably need to split GRUB_DISTRIBUTOR into a couple of different
+ variables.
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1242417
+Forwarded: not-needed
+Last-Update: 2013-11-12
+
+Index: b/util/grub-install.in
+===================================================================
+--- a/util/grub-install.in
++++ b/util/grub-install.in
+@@ -471,6 +471,10 @@
+         # not collide with other vendors.  To minimise collisions, we use the
+         # name of our distributor if possible.
+ 	efi_distributor="$bootloader_id"
++	case $efi_distributor in
++	    kubuntu)
++		efi_distributor=ubuntu ;;
++	esac
+ 	# It is convenient for each architecture to have a different
+ 	# efi_file, so that different versions can be installed in parallel.
+ 	case "$grub_modinfo_target_cpu" in

debian/patches/series

@@ -56,3 +56,4 @@ maybe_quiet.patch
 efidisk_non_512_sectors.patch
 mkconfig_hurd_sort.patch
 probe_dmraid.patch
+install_efi_ubuntu_flavours.patch

debian/postinst.in

@@ -671,6 +671,9 @@ case "$1" in
       grub-efi-ia32|grub-efi-amd64)
         bootloader_id="$(config_item GRUB_DISTRIBUTOR | tr A-Z a-z | \
                          cut -d' ' -f1)"
+        case $bootloader_id in
+          kubuntu) bootloader_id=ubuntu ;;
+        esac
         if [ "$bootloader_id" ] && [ -d "/boot/efi/EFI/$bootloader_id" ]; then
           grub-install
         fi

util/grub-install.in

@@ -471,6 +471,10 @@ if [ x"$grub_modinfo_platform" = xefi ]; then
         # not collide with other vendors.  To minimise collisions, we use the
         # name of our distributor if possible.
 	efi_distributor="$bootloader_id"
+	case $efi_distributor in
+	    kubuntu)
+		efi_distributor=ubuntu ;;
+	esac
 	# It is convenient for each architecture to have a different
 	# efi_file, so that different versions can be installed in parallel.
 	case "$grub_modinfo_target_cpu" in