Merge ~rafaeldtinoco/ubuntu/+source/grub2:lp1838525-eoan into ubuntu/+source/grub2:ubuntu/eoan-devel

[Rafael David Tinoco]

[Rafael David Tinoco (rafaeldtinoco)]

Bug:

https://bugs.launchpad.net/ubuntu/+source/debian-installer/+bug/1838525

contains valid SRU template with all explanations (hopefully) and summaries.

PPA:

https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1838525

contains a packaged version of the fix.

This is the merge request =).

[Rafael David Tinoco (rafaeldtinoco)]

Comment:

https://bugs.launchpad.net/ubuntu/+source/debian-installer/+bug/1838525/comments/32

Describes how I tested this fix.

Bug comment has the full way of verifying (which requires the installer to have this new grub-common package).

[Rafael David Tinoco (rafaeldtinoco)]

I have just rebased my changes to 2.04-1ubuntu10 since that version is the latest one (also submitted this same version to the PPA).

[Dimitri John Ledkov (xnox)]

review: Approve (coredev)

[Dimitri John Ledkov (xnox)]

Note to self:
- convert into the git-dpm repo
- upload this
- upload matching grub2-signed

[Dimitri John Ledkov (xnox)]

Pushed to:
https://code.launchpad.net/~ubuntu-core-dev/grub/+git/ubuntu/+ref/ubuntu

[Dimitri John Ledkov (xnox)]

Uploaded to unapproved queue.

[Andreas Hasenack (ahasenack)]

Switching to approved since it was reviewed and uploaded.

diff --git a/debian/changelog b/debian/changelog
index 43387cd..177a71c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grub2 (2.04-1ubuntu10) eoan; urgency=medium
+
+  * debian/patches/ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch:
+    skip /dev/disk/by-id/lvm-pvm-uuid entries from device iteration.
+    (LP: #1838525)
+
+ -- Rafael David Tinoco <[e-mail]>  Mon, 07 Oct 2019 23:23:54 -0300
+
 grub2 (2.04-1ubuntu9) eoan; urgency=medium
 
   * debian/patches/ubuntu-zfs-enhance-support.patch:
diff --git a/debian/patches/series b/debian/patches/series
index 9bec185..52aa88d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -66,3 +66,4 @@ ubuntu-clear-invalid-initrd-spacing.patch
 ubuntu-temp-keep-auto-nvram.patch
 ubuntu-add-devicetree-command-support.patch
 ubuntu-boot-from-multipath-dependent-symlink.patch
+ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch
diff --git a/debian/patches/ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch b/debian/patches/ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch
new file mode 100644
index 0000000..d1012e2
--- /dev/null
+++ b/debian/patches/ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch
@@ -0,0 +1,62 @@
+From 765731dae4dd076ae543a164c000544e147b3fd3 Mon Sep 17 00:00:00 2001
+From: Rafael David Tinoco <[e-mail]>
+Date: Mon, 7 Oct 2019 22:53:32 -0300
+Subject: [PATCH] Skip /dev/disk/by-id/lvm-pvm-uuid entries from device
+ iteration
+
+The following LVM2 commit:
+
+commit 417e52c13a8156b11c25c411d44bda8b32bf87e4
+Author: Peter Rajnoha <[e-mail]>
+Date: Tue Feb 18 07:27:21 2014
+
+    udev: create /dev/disk/by-id/lvm-pv-uuid-<PV_UUID> symlink for a PV
+
+    We already have /dev/disk/by-id/dm-uuid-... (which encompasses the
+    VG UUID and LV UUID in case of LVs since the mapping's UUID is
+    VG+LV UUID together) and /dev/disk/by-id/dm-name-... (which encompasses
+    the VG and LV name in case of LVs).
+
+    This patch addds /dev/disk/by-id/lvm-pv-uuid-<PV_UUID> that completes
+    this scheme and makes navigation a bit easier using PV UUIDs since
+    one can navigate using PV UUIDs only and there's no need to do extra
+    PV UUID <--> kernel name matching (the PV UUID is stable across reboots).
+    This may come in handy in various scripts.
+
+    Since we already have the PV UUID stored in udev database (as a result
+    of blkid call - returned in ID_FS_UUID blkid's variable), this operation
+    is very cheap indeed, just creating the extra one symlink.
+
+creates a udev rule that populates /dev/disk/by-id with LVM PVs
+according to discovered UUIDs. That will trigger a bad logic in
+debian-installer as the installer depends on grub_util_iterate_devices()
+logic to discover the disks that can have grub installed.
+
+This change only ignores those entries, so debian-installer bad
+execution path is not triggered, just like grub_iterate_devices()
+already does for other similar entries, like the partition ones.
+
+Author: Rafael David Tinoco <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1838525
+Last-Update: 2019-10-07
+---
+ util/deviceiter.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/util/deviceiter.c b/util/deviceiter.c
+index dddc50da7..ec9a6d0ab 100644
+--- a/util/deviceiter.c
++++ b/util/deviceiter.c
+@@ -589,6 +589,9 @@ grub_util_iterate_devices (int (*hook) (const char *, int, void *), void *hook_d
+ 	    /* Skip partition entries.  */
+ 	    if (strstr (entry->d_name, "-part"))
+ 	      continue;
++	    /* LVM might create /dev/disk/by-id/lvm-pv-uuid-<PV_UUID> symlinks */
++	    if (strstr (entry->d_name, "lvm-pv-uuid"))
++	      continue;
+ 	    /* Skip device-mapper entries; we'll handle the ones we want
+ 	       later.  */
+ 	    if (strncmp (entry->d_name, "dm-", sizeof ("dm-") - 1) == 0)
+-- 
+2.20.1
+