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 7D3FC1FF185 for ; Mon, 18 Aug 2025 21:39:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9F9133F78A; Mon, 18 Aug 2025 21:41:08 +0200 (CEST) From: Stoiko Ivanov To: pbs-devel@lists.proxmox.com Date: Mon, 18 Aug 2025 21:40:25 +0200 Message-Id: <20250818194026.840749-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250818194026.840749-1-s.ivanov@proxmox.com> References: <20250818194026.840749-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1755545993487 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: [pbs-devel] [PATCH proxmox-backup 2/3] pbs3to4: use boolean variable for systemd-boot installation state 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" while it's not saving too much run-time wise (each branch stats the file only once), it's a bit easier to read. Signed-off-by: Stoiko Ivanov --- src/bin/pbs3to4.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bin/pbs3to4.rs b/src/bin/pbs3to4.rs index 5df960a3..e700c832 100644 --- a/src/bin/pbs3to4.rs +++ b/src/bin/pbs3to4.rs @@ -206,8 +206,10 @@ impl Checker { self.output .log_info("Checking bootloader configuration...")?; + let sd_boot_installed = Path::new("/usr/share/doc/systemd-boot/changelog.Debian.gz").is_file(); + if !Path::new("/sys/firmware/efi").is_dir() { - if Path::new("/usr/share/doc/systemd-boot/changelog.Debian.gz").is_file() { + if sd_boot_installed { self.output.log_info( "systemd-boot package installed on legacy-boot system is not \ necessary, consider removing it", @@ -227,7 +229,7 @@ impl Checker { .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() { + if sd_boot_installed { self.output.log_fail( "systemd-boot meta-package installed. This will cause issues on upgrades of \ boot-related packages.\n\ @@ -237,7 +239,7 @@ impl Checker { return Ok(()); } } else { - if Path::new("/usr/share/doc/systemd-boot/changelog.Debian.gz").is_file() { + if sd_boot_installed { self.output.log_fail( "systemd-boot meta-package installed. This will cause problems on upgrades of other \ boot-related packages.\n\ -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel