public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Stefan Sterz <s.sterz@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-offline-mirror] add non-free-firmware to bookworm default components
Date: Mon, 17 Jul 2023 16:01:36 +0200	[thread overview]
Message-ID: <20230717140136.346273-1-s.sterz@proxmox.com> (raw)

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 <s.sterz@proxmox.com>
---
 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<Vec<MirrorConfig>, 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





             reply	other threads:[~2023-07-17 14:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-17 14:01 Stefan Sterz [this message]
2023-07-19 10:26 ` [pbs-devel] applied: " Fabian Grünbichler

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=20230717140136.346273-1-s.sterz@proxmox.com \
    --to=s.sterz@proxmox.com \
    --cc=pbs-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal