[pve-devel] [PATCH] btrfs: use proxmox-boot-tool to sync ESPs for RAID installs

[pve-devel] [PATCH] btrfs: use proxmox-boot-tool to sync ESPs for RAID installs

[Dominik Csapak]

instead of just having the first one mounted.

This is done by handling it the same as ZFS regarding the ESP.

This fixes an issue where installing with BTRFS showed a 'Boot Option
Restoration' prompt after boot.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 Proxmox/Install.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm
index 068b22c..cb6c502 100644
--- a/Proxmox/Install.pm
+++ b/Proxmox/Install.pm
@@ -1144,7 +1144,7 @@ sub extract_data {
 	# Note: this is required by current grub, but really dangerous, because
 	# vfat does not have journaling, so it triggers manual fsck after each crash
 	# so we only mount /boot/efi if really required (efi systems).
-	if ($run_env->{boot_type} eq 'efi' && !$use_zfs) {
+	if ($run_env->{boot_type} eq 'efi' && !($use_zfs || $use_btrfs)) {
 	    if (scalar(@$bootdevinfo)) {
 		my $di = @$bootdevinfo[0]; # simply use first disk
 
@@ -1368,7 +1368,7 @@ _EOD
 
 		foreach my $di (@$bootdevinfo) {
 		    my $dev = $di->{devname};
-		    if ($use_zfs) {
+		    if ($use_zfs || $use_btrfs) {
 			prepare_proxmox_boot_esp($di->{esp}, $targetdir, $run_env->{secure_boot});
 		    } else {
 			if (!$native_4k_disk_bootable) {
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH] btrfs: use proxmox-boot-tool to sync ESPs for RAID installs

[Thomas Lamprecht]

On Mon, 07 Apr 2025 15:21:48 +0200, Dominik Csapak wrote:
> instead of just having the first one mounted.
> 
> This is done by handling it the same as ZFS regarding the ESP.
> 
> This fixes an issue where installing with BTRFS showed a 'Boot Option
> Restoration' prompt after boot.
> 
> [...]

Applied, thanks!

[1/1] btrfs: use proxmox-boot-tool to sync ESPs for RAID installs
      commit: dc5b8d7c6f4c90c59bf6a0f6d71cc43aa4f4834a


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel