=== modified file 'debian/build-efi-images'
--- a/debian/build-efi-images	2015-06-14 15:52:27 +0000
+++ b/debian/build-efi-images	2015-06-23 20:26:03 +0000
@@ -55,8 +55,10 @@ if [ -z "\$prefix" -o ! -e "\$prefix" ];
 fi
 if [ -e \$prefix/$platform/grub.cfg ]; then
 	source \$prefix/$platform/grub.cfg
-else
+elif [ -e \$prefix/grub.cfg ]; then
 	source \$prefix/grub.cfg
+else
+	source \$cmdpath/grub.cfg
 fi
 EOF
 

=== modified file 'debian/changelog'
--- a/debian/changelog	2015-06-14 15:52:27 +0000
+++ b/debian/changelog	2015-06-23 21:12:38 +0000
@@ -1,3 +1,11 @@
+grub2 (2.02~beta2-25ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/build-efi-images: look for grub.cfg in $cmdpath too in gcdx64.efi,
+    to simplify embedded scenarios: putting a grub.cfg snippet that loads the
+    right "real" grub.cfg can be useful. (LP: #1468111)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Tue, 23 Jun 2015 11:38:14 -0400
+
 grub2 (2.02~beta2-25ubuntu1) wily; urgency=medium
 
   * Fix linuxefi module to be included on x86_64-efi rather than