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 028EE1FF183 for ; Wed, 5 Nov 2025 14:21:09 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D378924124; Wed, 5 Nov 2025 14:21:46 +0100 (CET) From: Robert Obkircher To: pve-devel@lists.proxmox.com Date: Wed, 5 Nov 2025 14:18:18 +0100 Message-ID: <20251105132017.18593-1-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1762348855016 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.000 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. [proxmox-offline-mirror.rs] Subject: [pve-devel] [PATCH proxmox-offline-mirror] fix #6895: include non-free-firmware in auto-added debian repos X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" 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 --- 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, 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