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

[Steve Langasek]

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

(Resubmit - grr, where does bzr lp-propose-merge get these ideas?)

[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

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-18 20:26:24 +0000
+++ debian/changelog	2013-10-10 17:06:04 +0000
@@ -1,3 +1,10 @@
+grub2 (2.00-19ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/ubuntu_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:
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-09-18 20:20:00 +0000
+++ debian/patches/series	2013-10-10 17:06:04 +0000
@@ -61,3 +61,4 @@
 ubuntu_vt_handoff.patch
 ubuntu_recovery_nomodeset.patch
 ubuntu_probe_dmraid.patch
+ubuntu_efi_always_install_grub_cfg.patch
 
=== added file 'debian/patches/ubuntu_efi_always_install_grub_cfg.patch'
--- debian/patches/ubuntu_efi_always_install_grub_cfg.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_efi_always_install_grub_cfg.patch	2013-10-10 17:06:04 +0000
@@ -0,0 +1,58 @@
+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
+@@ -638,7 +638,15 @@
+     config_opt_file="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
+ fi
+ 
+-if [ "x${devabstraction_module}" = "x" ] ; then
++if [ x"$grub_modinfo_platform" = xefi ]; then
++    if [ $removable = yes ]; then
++	efi_signed="${source_dir}-signed/gcd$efi_suffix.efi.signed"
++    else
++	efi_signed="${source_dir}-signed/grub$efi_suffix.efi.signed"
++    fi
++fi
++
++if [ "x${devabstraction_module}" = "x" ] || ([ x"$grub_modinfo_platform" = xefi ] && [ "$uefi_secure_boot" = yes ] && [ -e "$efi_signed" ]); then
+     if [ x"${install_device}" != x ]; then
+       if echo "${install_device}" | grep -qx "(.*)" ; then
+         install_drive="${install_device}"
+@@ -832,11 +840,6 @@
+     gettext "You will have to set \`SystemPartition' and \`OSLoader' manually." 1>&2
+     echo 1>&2
+ elif [ x"$grub_modinfo_platform" = xefi ]; then
+-    if [ $removable = yes ]; then
+-	efi_signed="${source_dir}-signed/gcd$efi_suffix.efi.signed"
+-    else
+-	efi_signed="${source_dir}-signed/grub$efi_suffix.efi.signed"
+-    fi
+     if [ "$uefi_secure_boot" = yes ] && [ -e "$efi_signed" ]; then
+ 	shim_signed=/usr/lib/shim/shim.efi.signed
+ 	if [ -e "$shim_signed" ]; then
+@@ -848,10 +851,8 @@
+ 	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"
+-	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-install.in'
--- util/grub-install.in	2013-08-15 09:03:10 +0000
+++ util/grub-install.in	2013-10-10 17:06:04 +0000
@@ -638,7 +638,15 @@
     config_opt_file="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
 fi
 
-if [ "x${devabstraction_module}" = "x" ] ; then
+if [ x"$grub_modinfo_platform" = xefi ]; then
+    if [ $removable = yes ]; then
+	efi_signed="${source_dir}-signed/gcd$efi_suffix.efi.signed"
+    else
+	efi_signed="${source_dir}-signed/grub$efi_suffix.efi.signed"
+    fi
+fi
+
+if [ "x${devabstraction_module}" = "x" ] || ([ x"$grub_modinfo_platform" = xefi ] && [ "$uefi_secure_boot" = yes ] && [ -e "$efi_signed" ]); then
     if [ x"${install_device}" != x ]; then
       if echo "${install_device}" | grep -qx "(.*)" ; then
         install_drive="${install_device}"
@@ -832,11 +840,6 @@
     gettext "You will have to set \`SystemPartition' and \`OSLoader' manually." 1>&2
     echo 1>&2
 elif [ x"$grub_modinfo_platform" = xefi ]; then
-    if [ $removable = yes ]; then
-	efi_signed="${source_dir}-signed/gcd$efi_suffix.efi.signed"
-    else
-	efi_signed="${source_dir}-signed/grub$efi_suffix.efi.signed"
-    fi
     if [ "$uefi_secure_boot" = yes ] && [ -e "$efi_signed" ]; then
 	shim_signed=/usr/lib/shim/shim.efi.signed
 	if [ -e "$shim_signed" ]; then
@@ -848,10 +851,8 @@
 	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"
-	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.