From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 6E8A61FF17C for ; Wed, 6 Aug 2025 13:02:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 75B9339DDD; Wed, 6 Aug 2025 13:03:32 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Wed, 6 Aug 2025 13:02:51 +0200 Message-Id: <20250806110251.2117322-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: 1754478157232 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.066 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pve8to9.pm] Subject: [pve-devel] [PATCH manager v2] 8 to 9 checks: do not ask bootctl if systemd-boot is used. 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" The current logic of deciding if systemd-boot was manually setup by the user (without proxmox-boot-tool), by checking `bootctl is-installed` yields a false-positive after upgrading: * systems which have the package installed (e.g. from our isos after 8.0), but do not use proxmox-boot-tool (LVM installs) will get systemd-boot installed to /boot/efi upon upgrade * after upgrading the check says that it's been explicitly setup. Rather warn if the package is installed (unless proxmox-boot-tool is used and the upgrade is still not done) in any case - as the number of systems which have it setup manually are probably far lower than those that upgrade without explicitly checking pve8to9. Reported-by: Daniel Herzig Signed-off-by: Stoiko Ivanov --- v1->v2: * fix a typo I overlooked before. PVE/CLI/pve8to9.pm | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm index 994189f1..084452fd 100644 --- a/PVE/CLI/pve8to9.pm +++ b/PVE/CLI/pve8to9.pm @@ -1604,7 +1604,7 @@ sub check_bootloader { if (!-d '/sys/firmware/efi') { if (-f "/usr/share/doc/systemd-boot/changelog.Debian.gz") { - log_info("systemd-boot package installed on legacy-boot system is not necessary, consider remoing it"); + log_info("systemd-boot package installed on legacy-boot system is not necessary, consider removing it"); return; } log_skip("System booted in legacy-mode - no need for additional packages"); @@ -1624,18 +1624,11 @@ sub check_bootloader { } } else { if (-f "/usr/share/doc/systemd-boot/changelog.Debian.gz") { - my $exit_code = eval { - run_command(['bootctl', 'is-installed', '--quiet', '--graceful'], noerr => 1); - }; - if ($exit_code != 0) { - log_warn( - "systemd-boot meta-package installed but the system does not seem to use it" - . " for booting. This can cause problems on upgrades of other boot-related packages." - . " Consider removing 'systemd-boot'"); - } else { - log_info("systemd-boot used as bootloader and fitting meta-package installed."); - return; - } + log_warn( + "systemd-boot meta-package installed. This can cause problems on upgrades of other" + ." boot-related packages. Unless you manually setup the system to use" + ." systemd-boot remove 'systemd-boot'"); + return; } 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," -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel