Merge ~ubuntu-core-dev/grub/+git/ubuntu:lp.564853 into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Steve Langasek]

[Colin Watson (cjwatson)]

Why isn't this just a cherry-pick of the work I did to fix this in Debian?

[Mathieu Trudel-Lapierre (cyphermox)]

It will be.

Rejecting since I'm taking the code by Colin from Debian.

review: Disapprove

Unmerged commits

6d8fff2... by Steve Langasek on 2019-02-07

apply debconf changes both to /etc/default/grub and to the ucf template

This avoids us showing ucf prompts when nothing has changed in either the
config file or in the package-provided template. ucf prompts will still be
shown only in the case that there is both a change to one of the
debconf-managed settings since the last update of grub, *and* there are
local changes to non-debconf-managed settings, because we cannot detect that
these are spurious.

Bug-Ubuntu: https://bugs.launchpad.net/ugs/564853

diff --git a/debian/changelog b/debian/changelog
index e900dc0..a62c928 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+grub2 (2.02+dfsg1-5ubuntu12) UNRELEASED; urgency=medium
+
+  * debian/postinst.in: apply debconf changes both to /etc/default/grub and
+    to the ucf template; this avoids us showing ucf prompts when nothing has
+    changed in either the config file or in the package-provided template.
+    LP: #564853.  ucf prompts will still be shown only in the case that
+    there is both a change to one of the debconf-managed settings since the
+    last update of grub, *and* there are local changes to
+    non-debconf-managed settings, because we cannot detect that these are
+    spurious.
+
+ -- Steve Langasek <[e-mail]>  Thu, 07 Feb 2019 07:41:52 -0800
+
 grub2 (2.02+dfsg1-5ubuntu11) disco; urgency=medium
 
   [ Mathieu Trudel-Lapierre ]
diff --git a/debian/postinst.in b/debian/postinst.in
index ae5df15..0253aa4 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -377,14 +377,18 @@ case "$1" in
 
     merge_debconf_into_conf "$tmp_default_grub" GRUB_CMDLINE_LINUX grub2/linux_cmdline
     merge_debconf_into_conf "$tmp_default_grub" GRUB_CMDLINE_LINUX_DEFAULT grub2/linux_cmdline_default
+    merge_debconf_into_conf /etc/default/grub GRUB_CMDLINE_LINUX grub2/linux_cmdline
+    merge_debconf_into_conf /etc/default/grub GRUB_CMDLINE_LINUX_DEFAULT grub2/linux_cmdline_default
 
     case @PACKAGE@ in
       grub-pc)
         merge_debconf_into_conf "$tmp_default_grub" GRUB_TIMEOUT grub-pc/timeout
+        merge_debconf_into_conf /etc/default/grub GRUB_TIMEOUT grub-pc/timeout
         sed -i -e 's/^\(GRUB_TIMEOUT=\)"\([0-9][0-9]*\)"/\1\2/' "$tmp_default_grub"
         db_get grub-pc/hidden_timeout
         if [ "$RET" = false ]; then
           sed -i -e 's/^GRUB_HIDDEN_TIMEOUT=/#&/' "$tmp_default_grub"
+          sed -i -e 's/^GRUB_HIDDEN_TIMEOUT=/#&/' /etc/default/grub
         fi
       ;;
       grub-ieee1275)