Merge ~juliank/ubiquity:ignore-small-esps into ubiquity:master

[Julian Andres Klode]

Only auto-configure ESP larger than 50 MB (workaround for LP 1924823)

Workaround for ESP on install medium (5 MB) being configured as the
system's ESP - require a minimum size of 50 MB. We should fix this
properly post-hirsute by checking that the ESP is not on the same disk
as the install medium.

[Dimitri John Ledkov (xnox)]

"We should fix this properly post-hirsute by checking that the ESP is not on the same disk
as the install medium."

That's not quite right, because we do support "in-place" install where we boot installer from the disk that we install things onto, and in such scenarios we do reuse the ESP.

I would be more interested in a check that is "reuse ESP that is on the same disk as /target/boot", otherwise create new ESP.

[Dimitri John Ledkov (xnox)]

review: Approve

[Steve Langasek (vorlon)]

On Mon, Apr 19, 2021 at 10:56:56AM -0000, Dimitri John Ledkov wrote:

> That's not quite right, because we do support "in-place" install where we
> boot installer from the disk that we install things onto, and in such
> scenarios we do reuse the ESP.

In what context does this occur? Are you referring to ubiquity use on a
"recovery partition"?

Mostly, in-place installs with ubiquity are the result of bugs and the cause
of install failures.

[Dimitri John Ledkov (xnox)]

On Tue, Apr 20, 2021 at 12:09 AM Steve Langasek
<email address hidden> wrote:
>
> On Mon, Apr 19, 2021 at 10:56:56AM -0000, Dimitri John Ledkov wrote:
>
> > That's not quite right, because we do support "in-place" install where we
> > boot installer from the disk that we install things onto, and in such
> > scenarios we do reuse the ESP.
>
> In what context does this occur? Are you referring to ubiquity use on a
> "recovery partition"?

I know of two scenarios when this is used.

1) is dell-recovery / ubuntu-recovery aka "reinstall from recovery"
that you mention

2) is factory provisioning. At some point in time, preinstalled images
were blasted onto the disk, booted to automatically install from the
internal drive to create preinstalled machine. If i recall correctly
this method also at different points in time used "to=ram" or kept the
boot partition and convert into a recovery one.

>
> Mostly, in-place installs with ubiquity are the result of bugs and the cause
> of install failures.

In general yes.

--
Regards,

Dimitri.

diff --git a/d-i/source/partman-efi/init.d/efi b/d-i/source/partman-efi/init.d/efi
index fe36192..3c6b516 100755
--- a/d-i/source/partman-efi/init.d/efi
+++ b/d-i/source/partman-efi/init.d/efi
@@ -10,6 +10,7 @@
 
 gpt_efi_type=c12a7328-f81f-11d2-ba4b-00a0c93ec93b
 msdos_efi_type=0xef
+esp_minimum_size=$((50 * 1024 * 1024))
 
 NUM_ESP=0
 NUM_NO=0
@@ -25,7 +26,9 @@ for dev in /var/lib/partman/devices/*; do
 	partitions=
 	open_dialog PARTITIONS
 	while { read_line num id size type fs path name; [ "$id" ]; }; do
-		if [ "$fs" = fat16 ]; then
+		if [ $size -lt $esp_minimum_size ]; then
+			:
+		elif [ "$fs" = fat16 ]; then
 			partitions="$partitions $id"
 		elif [ "$fs" = fat32 ] && echo "$name" |
                      grep -i "^EFI System Partition" >/dev/null; then
diff --git a/debian/changelog b/debian/changelog
index 2c1de23..b77fa11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubiquity (21.04.18) hirsute; urgency=medium
+
+  * Only auto-configure ESP larger than 50 MiB - this works around LP 1924823,
+    where the 5 MB ESP on the install medium was configured as /boot/efi.
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 19 Apr 2021 13:01:53 +0200
+
 ubiquity (21.04.17) hirsute; urgency=medium
 
   [ Rik Mills ]