From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 0947B1FF170 for ; Thu, 21 Aug 2025 19:01:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8DA1230125; Thu, 21 Aug 2025 19:01:15 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Thu, 21 Aug 2025 19:00:07 +0200 Message-Id: <20250821170007.148854-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1755795641186 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.063 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager] pve8to9: rework systemd-boot checks X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" This patch replicates the changes done in pbs3to4 from: https://lore.proxmox.com/pbs-devel/20250821141719.4130062-4-s.ivanov@proxmox.com/T/#u The check if systemd-boot presence is not problematic (before upgrade for systems that actually use it) is left in place with a log_skip,, all other situations where systemd-boot is installed are marked as failure and point to the upgrade guide in the pve-wiki. Signed-off-by: Stoiko Ivanov --- PVE/CLI/pve8to9.pm | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm index 218ba3f5..70b67f86 100644 --- a/PVE/CLI/pve8to9.pm +++ b/PVE/CLI/pve8to9.pm @@ -1558,8 +1558,10 @@ sub check_time_sync { sub check_bootloader { log_info("Checking bootloader configuration..."); + my $sd_boot_installed = -f "/usr/share/doc/systemd-boot/changelog.Debian.gz"; + if (!-d '/sys/firmware/efi') { - if (-f "/usr/share/doc/systemd-boot/changelog.Debian.gz") { + if ($sd_boot_installed) { log_warn( "systemd-boot package installed on legacy-boot system is not necessary, consider removing it" ); @@ -1592,22 +1594,7 @@ sub check_bootloader { return; } } - if (-f "/usr/share/doc/systemd-boot/changelog.Debian.gz") { - log_fail("systemd-boot meta-package installed this will cause issues on upgrades of" - . " boot-related packages. Install 'systemd-boot-efi' and 'systemd-boot-tools' explicitly" - . " and remove 'systemd-boot'"); - return; - } - log_pass("bootloader packages installed correctly"); } else { - if (-f "/usr/share/doc/systemd-boot/changelog.Debian.gz") { - log_fail( - "systemd-boot meta-package installed. This will cause problems on upgrades of other" - . " boot-related packages. Remove 'systemd-boot' See" - . " https://pve.proxmox.com/wiki/Upgrade_from_8_to_9#sd-boot-warning for more information." - ); - $boot_ok = 0; - } if (!-f "/usr/share/doc/grub-efi-amd64/changelog.Debian.gz") { log_warn("System booted in uefi mode but grub-efi-amd64 meta-package not installed," . " new grub versions will not be installed to /boot/efi! Install grub-efi-amd64." @@ -1637,9 +1624,18 @@ sub check_bootloader { $boot_ok = 0; } } - if ($boot_ok) { - log_pass("bootloader packages installed correctly"); - } + } + if ($sd_boot_installed) { + log_fail( + "systemd-boot meta-package installed. This will cause problems on upgrades of other" + . " boot-related packages. Remove 'systemd-boot' See" + . " https://pve.proxmox.com/wiki/Upgrade_from_8_to_9#sd-boot-warning for more information." + ); + $boot_ok = 0; + } + if ($boot_ok) { + log_pass("bootloader packages installed correctly"); + return; } } -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel