[pbs-devel] [PATCH proxmox-offline-mirror] add non-free-firmware to bookworm default components

[pbs-devel] [PATCH proxmox-offline-mirror] add non-free-firmware to bookworm default components

[Stefan Sterz]

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

[pbs-devel] applied: [PATCH proxmox-offline-mirror] add non-free-firmware to bookworm default components

[Fabian Grünbichler]

On July 17, 2023 4:01 pm, Stefan Sterz wrote:
> 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
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
> 
>