[pbs-devel] [PATCH proxmox-backup] bin: pbs3to4: adapt boot-loader checks to trixie

[Stoiko Ivanov <s.ivanov@proxmox.com>]

taken from the changes in pve8to9
(65ffcdd0c41e2bed95b34349a1f43757186f2a5f)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
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