grub

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

  1. Git
  2. lp:~mwhudson/grub/+git/ubuntu
  3. multipath-root-typo
  4. Merge into ubuntu
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: c4eac340b85dbcc0546188233c2cf831f05ce2d0
Proposed branch: ~mwhudson/grub/+git/ubuntu:multipath-root-typo
Merge into: ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu
Diff against target: 69 lines (+14/-6)
4 files modified
debian/.git-dpm (+2/-2)
debian/changelog (+8/-0)
debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch (+3/-3)
util/grub.d/10_linux.in (+1/-1)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+371182@code.launchpad.net

Description of the change

I made a booboo

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
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 3b1c29a..2e67c4d 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-9c232f391a130bf7b12b60d0192a92ffdb5acc21
8-9c232f391a130bf7b12b60d0192a92ffdb5acc21
9+7d601028aaa78434e8bae8f202afbae1d0d7cbc2
10+7d601028aaa78434e8bae8f202afbae1d0d7cbc2
11 578bb115fbd47e1c464696f1f8d6183e5443975d
12 578bb115fbd47e1c464696f1f8d6183e5443975d
13 grub2_2.04.orig.tar.xz
14diff --git a/debian/changelog b/debian/changelog
15index 099155e..1f440f0 100644
16--- a/debian/changelog
17+++ b/debian/changelog
18@@ -1,3 +1,11 @@
19+grub2 (2.04-1ubuntu5) UNRELEASED; urgency=medium
20+
21+ * d/patches/ubuntu-boot-from-multipath-dependent-symlink.patch: fix
22+ mis-spelling of helper function in final computation of GRUB_DEVICE in
23+ multipath case.
24+
25+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Mon, 12 Aug 2019 11:07:51 +1200
26+
27 grub2 (2.04-1ubuntu4) eoan; urgency=medium
28
29 * d/patches/ubuntu-boot-from-multipath-dependent-symlink.patch: when / is
30diff --git a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
31index 35d3787..5254adf 100644
32--- a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
33+++ b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
34@@ -1,4 +1,4 @@
35-From 9c232f391a130bf7b12b60d0192a92ffdb5acc21 Mon Sep 17 00:00:00 2001
36+From 7d601028aaa78434e8bae8f202afbae1d0d7cbc2 Mon Sep 17 00:00:00 2001
37 From: Michael Hudson-Doyle <michael.hudson@canonical.com>
38 Date: Tue, 6 Aug 2019 12:31:47 +1200
39 Subject: UBUNTU: Boot from multipath-dependent symlink when / is multipathed.
40@@ -16,7 +16,7 @@ Patch-Name: ubuntu-boot-from-multipath-dependent-symlink.patch
41 1 file changed, 41 insertions(+)
42
43 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
44-index d6937cfef..8f3fbc41f 100644
45+index d6937cfef..3eb0e6936 100644
46 --- a/util/grub.d/10_linux.in
47 +++ b/util/grub.d/10_linux.in
48 @@ -65,6 +65,47 @@ esac
49@@ -60,7 +60,7 @@ index d6937cfef..8f3fbc41f 100644
50 + # using root=UUID= exposes the boot process to udev races. In addition
51 + # GRUB_DEVICE in this case will be /dev/dm-0 or similar -- better to use a
52 + # symlink that depends on the multipath name.
53-+ GRUB_DEVICE=/dev/mapper/"$(get_dm_field_dev $GRUB_DEVICE name)"
54++ GRUB_DEVICE=/dev/mapper/"$(get_dm_field_for_dev $GRUB_DEVICE name)"
55 + GRUB_DISABLE_LINUX_UUID=true
56 +fi
57 +
58diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
59index 8f3fbc4..3eb0e69 100644
60--- a/util/grub.d/10_linux.in
61+++ b/util/grub.d/10_linux.in
62@@ -102,7 +102,7 @@ if test -e "${GRUB_DEVICE}" && is_multipath "${GRUB_DEVICE}"; then
63 # using root=UUID= exposes the boot process to udev races. In addition
64 # GRUB_DEVICE in this case will be /dev/dm-0 or similar -- better to use a
65 # symlink that depends on the multipath name.
66- GRUB_DEVICE=/dev/mapper/"$(get_dm_field_dev $GRUB_DEVICE name)"
67+ GRUB_DEVICE=/dev/mapper/"$(get_dm_field_for_dev $GRUB_DEVICE name)"
68 GRUB_DISABLE_LINUX_UUID=true
69 fi
70

Subscribers

People subscribed via source and target branches