[pve-devel] [PATCH proxmox-offline-mirror] fix #6895: include non-free-firmware in auto-added debian repos

[Robert Obkircher]

The bug report pointed out, that manually added Debian repos include
the non-free and non-free-firmware components by default, whereas the
automatically added repos do not include them.

It makes sense to auto-add non-free-firmware to match the behavior of
the installer. However, non-free better remains excluded, because in
this case there is no interactive prompt that allows the user to opt
out of the likely unnecessary component.

Signed-off-by: Robert Obkircher <r.obkircher at proxmox.com>
---
 src/bin/proxmox-offline-mirror.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/bin/proxmox-offline-mirror.rs b/src/bin/proxmox-offline-mirror.rs
index 23d64b7..1a752d2 100644
--- a/src/bin/proxmox-offline-mirror.rs
+++ b/src/bin/proxmox-offline-mirror.rs
@@ -368,20 +368,25 @@ fn action_add_mirror(config: &SectionConfigData) -> Result<Vec<MirrorConfig>, Er
         let architectures = vec!["amd64".to_string(), "all".to_string()];
 
         if add_debian_repo {
+            let components = if release >= &Release::Bookworm {
+                "main contrib non-free-firmware"
+            } else {
+                "main contrib"
+            };
             extra_repos.push(derive_debian_repo(
                 release,
                 &DebianVariant::Main,
-                "main contrib",
+                components,
             )?);
             extra_repos.push(derive_debian_repo(
                 release,
                 &DebianVariant::Updates,
-                "main contrib",
+                components,
             )?);
             extra_repos.push(derive_debian_repo(
                 release,
                 &DebianVariant::Security,
-                "main contrib",
+                components,
             )?);
         }
         (
-- 
2.47.3