Merge ~mwhudson/grub/+git/ubuntu:multipath-root-typo into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Michael Hudson-Doyle]

I made a booboo

[Steve Langasek (vorlon)]

review: Approve

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 3b1c29a..2e67c4d 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-9c232f391a130bf7b12b60d0192a92ffdb5acc21
-9c232f391a130bf7b12b60d0192a92ffdb5acc21
+7d601028aaa78434e8bae8f202afbae1d0d7cbc2
+7d601028aaa78434e8bae8f202afbae1d0d7cbc2
 578bb115fbd47e1c464696f1f8d6183e5443975d
 578bb115fbd47e1c464696f1f8d6183e5443975d
 grub2_2.04.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index 099155e..1f440f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grub2 (2.04-1ubuntu5) UNRELEASED; urgency=medium
+
+  * d/patches/ubuntu-boot-from-multipath-dependent-symlink.patch: fix
+    mis-spelling of helper function in final computation of GRUB_DEVICE in
+    multipath case.
+
+ -- Michael Hudson-Doyle <[e-mail]>  Mon, 12 Aug 2019 11:07:51 +1200
+
 grub2 (2.04-1ubuntu4) eoan; urgency=medium
 
   * d/patches/ubuntu-boot-from-multipath-dependent-symlink.patch: when / is
diff --git a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
index 35d3787..5254adf 100644
--- a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
+++ b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
@@ -1,4 +1,4 @@
-From 9c232f391a130bf7b12b60d0192a92ffdb5acc21 Mon Sep 17 00:00:00 2001
+From 7d601028aaa78434e8bae8f202afbae1d0d7cbc2 Mon Sep 17 00:00:00 2001
 From: Michael Hudson-Doyle <[e-mail]>
 Date: Tue, 6 Aug 2019 12:31:47 +1200
 Subject: UBUNTU: Boot from multipath-dependent symlink when / is multipathed.
@@ -16,7 +16,7 @@ Patch-Name: ubuntu-boot-from-multipath-dependent-symlink.patch
  1 file changed, 41 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index d6937cfef..8f3fbc41f 100644
+index d6937cfef..3eb0e6936 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -65,6 +65,47 @@ esac
@@ -60,7 +60,7 @@ index d6937cfef..8f3fbc41f 100644
 +    # using root=UUID= exposes the boot process to udev races. In addition
 +    # GRUB_DEVICE in this case will be /dev/dm-0 or similar -- better to use a
 +    # symlink that depends on the multipath name.
-+    GRUB_DEVICE=/dev/mapper/"$(get_dm_field_dev $GRUB_DEVICE name)"
++    GRUB_DEVICE=/dev/mapper/"$(get_dm_field_for_dev $GRUB_DEVICE name)"
 +    GRUB_DISABLE_LINUX_UUID=true
 +fi
 +
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 8f3fbc4..3eb0e69 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -102,7 +102,7 @@ if test -e "${GRUB_DEVICE}" && is_multipath "${GRUB_DEVICE}"; then
     # using root=UUID= exposes the boot process to udev races. In addition
     # GRUB_DEVICE in this case will be /dev/dm-0 or similar -- better to use a
     # symlink that depends on the multipath name.
-    GRUB_DEVICE=/dev/mapper/"$(get_dm_field_dev $GRUB_DEVICE name)"
+    GRUB_DEVICE=/dev/mapper/"$(get_dm_field_for_dev $GRUB_DEVICE name)"
     GRUB_DISABLE_LINUX_UUID=true
 fi