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 B17A71FF17C for ; Wed, 6 Aug 2025 13:47:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1C1443B14B; Wed, 6 Aug 2025 13:49:20 +0200 (CEST) From: Stoiko Ivanov To: pbs-devel@lists.proxmox.com Date: Wed, 6 Aug 2025 13:49:09 +0200 Message-Id: <20250806114909.2143258-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: 1754480935613 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. [pbs3to4.rs] Subject: [pbs-devel] [PATCH proxmox-backup] bin: pbs3to4: adapt boot-loader checks to trixie X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" taken from the changes in pve8to9 (65ffcdd0c41e2bed95b34349a1f43757186f2a5f) Signed-off-by: Stoiko Ivanov --- tested on a pbs 4 system i use for testing src/bin/pbs3to4.rs | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/bin/pbs3to4.rs b/src/bin/pbs3to4.rs index 67640b48..75331eb5 100644 --- a/src/bin/pbs3to4.rs +++ b/src/bin/pbs3to4.rs @@ -207,6 +207,13 @@ impl Checker { .log_info("Checking bootloader configuration...")?; if !Path::new("/sys/firmware/efi").is_dir() { + if !Path::new("/usr/share/doc/systemd-boot/changelog.Debian.gz").is_file() { + self.output.log_info( + "systemd-boot package installed on legacy-boot system is not \ + necessary, consider removing it", + )?; + return Ok(()); + } self.output .log_skip("System booted in legacy-mode - no need for systemd-boot")?; return Ok(()); @@ -216,25 +223,29 @@ impl Checker { // PBS packages version check needs to be run before if !self.upgraded { self.output - .log_skip("not yet upgraded, no need to check the presence of systemd-boot")?; + .log_skip("not yet upgraded, systemd-boot still needed for bootctl")?; return Ok(()); } if Path::new("/usr/share/doc/systemd-boot/changelog.Debian.gz").is_file() { - self.output - .log_pass("bootloader packages installed correctly")?; + self.output.log_warn( + "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 Ok(()); } + } else if Path::new("/usr/share/doc/systemd-boot/changelog.Debian.gz").is_file() { self.output.log_warn( - "proxmox-boot-tool is used for bootloader configuration in uefi mode \ - but the separate systemd-boot package, is not installed.\n\ - initializing new ESPs will not work until the package is installed.", + "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 Ok(()); } else if !Path::new("/usr/share/doc/grub-efi-amd64/changelog.Debian.gz").is_file() { self.output.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.", + new grub versions will not be installed to /boot/efi! + Install grub-efi-amd64.", )?; return Ok(()); } else { -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel