public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH] btrfs: use proxmox-boot-tool to sync ESPs for RAID installs
Date: Mon,  7 Apr 2025 15:21:48 +0200	[thread overview]
Message-ID: <20250407132148.1051289-1-d.csapak@proxmox.com> (raw)

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


             reply	other threads:[~2025-04-07 13:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-07 13:21 Dominik Csapak [this message]
2025-04-07 13:24 ` [pve-devel] applied: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250407132148.1051289-1-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal