From: Robert Obkircher <r.obkircher@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-offline-mirror] fix #6895: include non-free-firmware in auto-added debian repos
Date: Wed, 5 Nov 2025 14:18:18 +0100 [thread overview]
Message-ID: <20251105132017.18593-1-r.obkircher@proxmox.com> (raw)
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@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
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
reply other threads:[~2025-11-05 13:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251105132017.18593-1-r.obkircher@proxmox.com \
--to=r.obkircher@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox