Merge ~2bdkid/ubuntu/+source/ubiquity:fix-1396379 into ubuntu/+source/ubiquity:ubuntu/devel

[Brady Dean]

set the partman-auto/disk question to the selected bootloader install device so partman will select an EFI partition from only that device.

[Brady Dean (2bdkid)]

To reproduce the original bug you need 2 hard drives present, with one pre-formatted with an EFI partition. Select for ubuntu to be installed onto the second hard drive, and select it as the bootloader install device. You'll notice that the EFI partition from the first drive is mounted to /target/boot/efi instead of the EFI partition from the second drive.

I applied this change in the 20.10 live installer and found it correctly mounted the EFI partition from the second drive.

[Ubfan (ubfan1)]

The second drive may also be an USB stick. The mount to /target/boot/efi occurs early in the install process, so it may be quickly determined if the patch works, mounting the ESP from the target USB.

[Brady Dean (2bdkid)]

It's unfortunate that this option is not given explicitly to partman in the same way it is to grub-installer.

Is there some other special handling for USB targets? I'm short on USB drives otherwise I'd give it a try.

[Łukasz Zemczak (sil2100)]

Thank you for the merge proposal! As I can't really properly review the change per-se (even though it seems at least going in the right direction, but I'd like someone to confirm that this does what is expected first), I'll only comment on the debian/ parts for now.

The branch needs to be rebased to the latest devel branch. Also, we don't really do +nmuX versioning in Ubuntu. Please bump it to the next available version for the selected series.

review: Needs Fixing (packaging)

[Łukasz Zemczak (sil2100)]

But yes, before we can proceed at all, I'd like someone to run some tests on this.

Unmerged commits

528f339... by Brady Dean <email address hidden> on 2022-11-10

Update changelog.

e921de9... by Brady Dean <email address hidden> on 2022-11-10

Set partman-auto/disk question when bootloader device is selected.

diff --git a/debian/changelog b/debian/changelog
index 7c40ed1..63013b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ubiquity (22.10.10+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * ubiquity: set the partman-auto/disk question to the device selected to install the bootloader on
+    (LP: #1396379)
+
+ -- Brady Dean <[e-mail]>  Thu, 10 Nov 2022 10:20:05 -0500
+
 ubiquity (22.10.10) kinetic; urgency=medium
 
   * Temporarily disable zfs + encryption option (LP: #1993318)
diff --git a/ubiquity/plugins/ubi-partman.py b/ubiquity/plugins/ubi-partman.py
index 8059446..9620555 100644
--- a/ubiquity/plugins/ubi-partman.py
+++ b/ubiquity/plugins/ubi-partman.py
@@ -3546,6 +3546,7 @@ class Page(plugin.Plugin):
     def ok_handler(self):
         if self.install_bootloader and not self.is_bootdev_preseeded():
             self.preseed('grub-installer/bootdev', self.ui.get_grub_choice())
+            self.preseed('partman-auto/disk', self.ui.get_grub_choice())
 
         if self.current_question.endswith('automatically_partition'):
             (autopartition_choice, self.extra_choice, method) = \