Merge ~ubuntu-core-dev/grub/+git/ubuntu:breadcrumbs into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Mathieu Trudel-Lapierre]

debian/patches/mkconfig_leave_breadcrumbs.patch: make sure grub-mkconfig
leaves a trace of what files were sourced to help generate the config
we're building.

Add breadcrumbs so we know what files in /etc/default/grub, /etc/default/grub.d/* are used to generate grub configuration.

[Steve Langasek (vorlon)]

+1 based on out-of-band confirmation from Matt that this matches existing quoting convention in grub output.

review: Approve

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 1670e9a..5fbfdf7 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-896d6d6ed832e6a2a1429cf17a51bc94efcb3de1
-896d6d6ed832e6a2a1429cf17a51bc94efcb3de1
+4c5bf7a6fa6798a5972bdf7999edd3bb5e294647
+4c5bf7a6fa6798a5972bdf7999edd3bb5e294647
 59aeb1cfaa3d5bfd7bbeeee0f0d37f6d9eed51fe
 59aeb1cfaa3d5bfd7bbeeee0f0d37f6d9eed51fe
 grub2_2.02+dfsg1.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index f4ca0e8..d14d8ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 grub2 (2.02+dfsg1-5ubuntu9) UNRELEASED; urgency=medium
 
+  [ Steve Langasek ]
   * debian/patches/quick-boot-lvm.patch: If we don't have writable
     grubenv and we're on EFI, always show the menu.  Closes LP: #1800722.
 
+  [ Mathieu Trudel-Lapierre ]
+  * debian/patches/mkconfig_leave_breadcrumbs.patch: make sure grub-mkconfig
+    leaves a trace of what files were sourced to help generate the config
+    we're building.
+
  -- Steve Langasek <[e-mail]>  Tue, 30 Oct 2018 15:46:28 -0700
 
 grub2 (2.02+dfsg1-5ubuntu8) cosmic; urgency=medium
diff --git a/debian/patches/mkconfig_leave_breadcrumbs.patch b/debian/patches/mkconfig_leave_breadcrumbs.patch
 new file mode 100644
index 0000000..62a4f58
--- /dev/null
+++ b/debian/patches/mkconfig_leave_breadcrumbs.patch
@@ -0,0 +1,29 @@
+From 4c5bf7a6fa6798a5972bdf7999edd3bb5e294647 Mon Sep 17 00:00:00 2001
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Date: Fri, 14 Dec 2018 13:46:14 -0500
+Subject: grub-mkconfig: leave a trace of what files were sourced to generate
+ the config
+
+Patch-Name: mkconfig_leave_breadcrumbs.patch
+Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
+---
+ util/grub-mkconfig.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index 9fca8cd7e..f1e7ca829 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -155,10 +155,12 @@ if [ x"$GRUB_FS" = xunknown ]; then
+ fi
+ 
+ if test -f ${sysconfdir}/default/grub ; then
++  gettext_printf "Sourcing file \`%s'\n" "${sysconfdir}/default/grub" 1>&2
+   . ${sysconfdir}/default/grub
+ fi
+ for x in ${sysconfdir}/default/grub.d/*.cfg ; do
+   if [ -e "${x}" ]; then
++    gettext_printf "Sourcing file \`%s'\n" "${x}" 1>&2
+     . "${x}"
+   fi
+ done
diff --git a/debian/patches/series b/debian/patches/series
index 472bf2b..75a5629 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -93,3 +93,4 @@ linuxefi_fix_relocate_coff.patch
 linuxefi_truncate_overlong_relocs.patch
 add-initrd-less-boot-fallback.patch
 quick-boot-lvm.patch
+mkconfig_leave_breadcrumbs.patch
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 9fca8cd..f1e7ca8 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -155,10 +155,12 @@ if [ x"$GRUB_FS" = xunknown ]; then
 fi
 
 if test -f ${sysconfdir}/default/grub ; then
+  gettext_printf "Sourcing file \`%s'\n" "${sysconfdir}/default/grub" 1>&2
   . ${sysconfdir}/default/grub
 fi
 for x in ${sysconfdir}/default/grub.d/*.cfg ; do
   if [ -e "${x}" ]; then
+    gettext_printf "Sourcing file \`%s'\n" "${x}" 1>&2
     . "${x}"
   fi
 done