Merge ~juliank/grub/+git/ubuntu:grub-multi-install-discovery into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

Proposed by Julian Andres Klode
Status: Work in progress
Proposed branch: ~juliank/grub/+git/ubuntu:grub-multi-install-discovery
Merge into: ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu
Diff against target: 13 lines (+2/-0)
1 file modified
debian/grub-multi-install (+2/-0)
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+425279@code.launchpad.net

Description of the change

Various bugfixes for FR-2493. To be rebased with a Launchpad bug ID for SRU

To post a comment you must log in.

Unmerged commits

ae85cfb... by Julian Andres Klode

grub-multi-install: Reset partition type between partitions

Reconfiguring shim-signed in a lxd VM offered /dev/sda as
an ESP, which is obviously wrong.

What happened is that it did not have any ID_PART_ENTRY_TYPE
or ID_PART_ENTRY_SCHEME properties set in udev, so the eval
did not set anything, and the values from the previous partition
were reused.

LP: #1997795

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/grub-multi-install b/debian/grub-multi-install
2index bedc700..5c2ad09 100755
3--- a/debian/grub-multi-install
4+++ b/debian/grub-multi-install
5@@ -225,6 +225,8 @@ usable_efi_system_partitions()
6 last_partition=
7 (
8 for partition in /dev/disk/by-id/*; do
9+ ID_PART_ENTRY_TYPE=""
10+ ID_PART_ENTRY_SCHEME=""
11 eval "$(udevadm info -q property -n "$partition" | grep -E '^ID_PART_ENTRY_(TYPE|SCHEME)=')"
12 if [ -z "$ID_PART_ENTRY_TYPE" -o -z "$ID_PART_ENTRY_SCHEME" -o \
13 \( "$ID_PART_ENTRY_SCHEME" != gpt -a "$ID_PART_ENTRY_SCHEME" != dos \) -o \

Subscribers

People subscribed via source and target branches