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

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: a053265bdf9d204aede8c593bed6e68a69513f72
Proposed branch: ~ubuntu-core-dev/grub/+git/ubuntu:breadcrumbs
Merge into: ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu
Diff against target: 93 lines (+40/-2)
5 files modified
debian/.git-dpm (+2/-2)
debian/changelog (+6/-0)
debian/patches/mkconfig_leave_breadcrumbs.patch (+29/-0)
debian/patches/series (+1/-0)
util/grub-mkconfig.in (+2/-0)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+361465@code.launchpad.net

Commit message

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.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
Revision history for this message
Steve Langasek (vorlon) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/.git-dpm b/debian/.git-dpm
2index 1670e9a..5fbfdf7 100644
3--- a/debian/.git-dpm
4+++ b/debian/.git-dpm
5@@ -1,6 +1,6 @@
6 # see git-dpm(1) from git-dpm package
7-896d6d6ed832e6a2a1429cf17a51bc94efcb3de1
8-896d6d6ed832e6a2a1429cf17a51bc94efcb3de1
9+4c5bf7a6fa6798a5972bdf7999edd3bb5e294647
10+4c5bf7a6fa6798a5972bdf7999edd3bb5e294647
11 59aeb1cfaa3d5bfd7bbeeee0f0d37f6d9eed51fe
12 59aeb1cfaa3d5bfd7bbeeee0f0d37f6d9eed51fe
13 grub2_2.02+dfsg1.orig.tar.xz
14diff --git a/debian/changelog b/debian/changelog
15index f4ca0e8..d14d8ec 100644
16--- a/debian/changelog
17+++ b/debian/changelog
18@@ -1,8 +1,14 @@
19 grub2 (2.02+dfsg1-5ubuntu9) UNRELEASED; urgency=medium
20
21+ [ Steve Langasek ]
22 * debian/patches/quick-boot-lvm.patch: If we don't have writable
23 grubenv and we're on EFI, always show the menu. Closes LP: #1800722.
24
25+ [ Mathieu Trudel-Lapierre ]
26+ * debian/patches/mkconfig_leave_breadcrumbs.patch: make sure grub-mkconfig
27+ leaves a trace of what files were sourced to help generate the config
28+ we're building.
29+
30 -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 30 Oct 2018 15:46:28 -0700
31
32 grub2 (2.02+dfsg1-5ubuntu8) cosmic; urgency=medium
33diff --git a/debian/patches/mkconfig_leave_breadcrumbs.patch b/debian/patches/mkconfig_leave_breadcrumbs.patch
34new file mode 100644
35index 0000000..62a4f58
36--- /dev/null
37+++ b/debian/patches/mkconfig_leave_breadcrumbs.patch
38@@ -0,0 +1,29 @@
39+From 4c5bf7a6fa6798a5972bdf7999edd3bb5e294647 Mon Sep 17 00:00:00 2001
40+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
41+Date: Fri, 14 Dec 2018 13:46:14 -0500
42+Subject: grub-mkconfig: leave a trace of what files were sourced to generate
43+ the config
44+
45+Patch-Name: mkconfig_leave_breadcrumbs.patch
46+Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
47+---
48+ util/grub-mkconfig.in | 2 ++
49+ 1 file changed, 2 insertions(+)
50+
51+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
52+index 9fca8cd7e..f1e7ca829 100644
53+--- a/util/grub-mkconfig.in
54++++ b/util/grub-mkconfig.in
55+@@ -155,10 +155,12 @@ if [ x"$GRUB_FS" = xunknown ]; then
56+ fi
57+
58+ if test -f ${sysconfdir}/default/grub ; then
59++ gettext_printf "Sourcing file \`%s'\n" "${sysconfdir}/default/grub" 1>&2
60+ . ${sysconfdir}/default/grub
61+ fi
62+ for x in ${sysconfdir}/default/grub.d/*.cfg ; do
63+ if [ -e "${x}" ]; then
64++ gettext_printf "Sourcing file \`%s'\n" "${x}" 1>&2
65+ . "${x}"
66+ fi
67+ done
68diff --git a/debian/patches/series b/debian/patches/series
69index 472bf2b..75a5629 100644
70--- a/debian/patches/series
71+++ b/debian/patches/series
72@@ -93,3 +93,4 @@ linuxefi_fix_relocate_coff.patch
73 linuxefi_truncate_overlong_relocs.patch
74 add-initrd-less-boot-fallback.patch
75 quick-boot-lvm.patch
76+mkconfig_leave_breadcrumbs.patch
77diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
78index 9fca8cd..f1e7ca8 100644
79--- a/util/grub-mkconfig.in
80+++ b/util/grub-mkconfig.in
81@@ -155,10 +155,12 @@ if [ x"$GRUB_FS" = xunknown ]; then
82 fi
83
84 if test -f ${sysconfdir}/default/grub ; then
85+ gettext_printf "Sourcing file \`%s'\n" "${sysconfdir}/default/grub" 1>&2
86 . ${sysconfdir}/default/grub
87 fi
88 for x in ${sysconfdir}/default/grub.d/*.cfg ; do
89 if [ -e "${x}" ]; then
90+ gettext_printf "Sourcing file \`%s'\n" "${x}" 1>&2
91 . "${x}"
92 fi
93 done

Subscribers

People subscribed via source and target branches