From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id F1EEFDB88 for ; Mon, 17 Jul 2023 16:02:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DB002E3B9 for ; Mon, 17 Jul 2023 16:02:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 17 Jul 2023 16:02:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E50A642904 for ; Mon, 17 Jul 2023 16:02:06 +0200 (CEST) From: Stefan Sterz To: pbs-devel@lists.proxmox.com Date: Mon, 17 Jul 2023 16:01:36 +0200 Message-Id: <20230717140136.346273-1-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.092 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-offline-mirror] add non-free-firmware to bookworm default components 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: , X-List-Received-Date: Mon, 17 Jul 2023 14:02:08 -0000 this adds the non-free-firmware component introduced with debian bookworm [1] to the default components for bookworm mirrors. since this new component is a subset [2] of the previous "non-free" component add it here too to keep the same set of packages available. [1]: https://wiki.debian.org/Firmware#Debian_12_.28bookworm.29_and_later [2]: https://www.debian.org/releases/bookworm/amd64/release-notes/ch-information.en.html#non-free-split Signed-off-by: Stefan Sterz --- src/bin/proxmox-offline-mirror.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/bin/proxmox-offline-mirror.rs b/src/bin/proxmox-offline-mirror.rs index f5be2c0..9d37ea6 100644 --- a/src/bin/proxmox-offline-mirror.rs +++ b/src/bin/proxmox-offline-mirror.rs @@ -235,9 +235,15 @@ fn action_add_mirror(config: &SectionConfigData) -> Result, Er ]; let variant = read_selection_from_tty("Select repository variant", variants, Some(0))?; + + let default_components = match release { + Release::Bookworm => "main contrib non-free non-free-firmware", + _ => "main contrib non-free" + }; + let components = read_string_from_tty( "Enter repository components", - Some("main contrib non-free"), + Some(default_components), )?; derive_debian_repo(release, variant, &components)? -- 2.39.2