From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-offline-mirror 3/8] wizard: switch to .pgp for Debian keyring files
Date: Mon, 8 Sep 2025 15:16:44 +0200 [thread overview]
Message-ID: <20250908131658.650928-4-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20250908131658.650928-1-f.gruenbichler@proxmox.com>
.gpg is only used for backwards-compat via a symlink
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
src/bin/proxmox-offline-mirror.rs | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/bin/proxmox-offline-mirror.rs b/src/bin/proxmox-offline-mirror.rs
index 9b8a230..fb0f43e 100644
--- a/src/bin/proxmox-offline-mirror.rs
+++ b/src/bin/proxmox-offline-mirror.rs
@@ -162,26 +162,27 @@ fn derive_debian_repo(
};
let url = format!("{url} {components}");
+
let key = match (release, variant) {
(Release::Trixie, DebianVariant::Security) => {
- "/usr/share/keyrings/debian-archive-trixie-security-automatic.gpg"
+ "/usr/share/keyrings/debian-archive-trixie-security-automatic.pgp"
}
(Release::Trixie, DebianVariant::Updates) | (Release::Trixie, DebianVariant::Backports) => {
- "/usr/share/keyrings/debian-archive-trixie-automatic.gpg"
+ "/usr/share/keyrings/debian-archive-trixie-automatic.pgp"
}
- (Release::Trixie, _) => "/usr/share/keyrings/debian-archive-trixie-stable.gpg",
+ (Release::Trixie, _) => "/usr/share/keyrings/debian-archive-trixie-stable.pgp",
(Release::Bookworm, DebianVariant::Security) => {
- "/usr/share/keyrings/debian-archive-bookworm-security-automatic.gpg"
+ "/usr/share/keyrings/debian-archive-bookworm-security-automatic.pgp"
}
(Release::Bookworm, DebianVariant::Updates)
| (Release::Bookworm, DebianVariant::Backports) => {
- "/usr/share/keyrings/debian-archive-bookworm-automatic.gpg"
+ "/usr/share/keyrings/debian-archive-bookworm-automatic.pgp"
}
- (Release::Bookworm, _) => "/usr/share/keyrings/debian-archive-bookworm-stable.gpg",
+ (Release::Bookworm, _) => "/usr/share/keyrings/debian-archive-bookworm-stable.pgp",
(Release::Bullseye, DebianVariant::Security) => {
- "/usr/share/keyrings/debian-archive-bullseye-security-automatic.gpg"
+ "/usr/share/keyrings/debian-archive-bullseye-security-automatic.pgp"
}
- (Release::Bullseye, _) => "/usr/share/keyrings/debian-archive-bullseye-automatic.gpg",
+ (Release::Bullseye, _) => "/usr/share/keyrings/debian-archive-bullseye-automatic.pgp",
(Release::Buster, DebianVariant::Security) => {
"/usr/share/keyrings/debian-archive-buster-security-automatic.gpg"
}
--
2.47.3
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2025-09-08 13:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-08 13:16 [pve-devel] [PATCH proxmox-offline-mirror 0/8] misc. wizard cleanup Fabian Grünbichler
2025-09-08 13:16 ` [pve-devel] [PATCH proxmox-offline-mirror 1/8] wizard: simplify repository url generation Fabian Grünbichler
2025-09-08 13:16 ` [pve-devel] [PATCH proxmox-offline-mirror 2/8] wizard: implement PartialOrd/Ord on Release Fabian Grünbichler
2025-09-08 13:16 ` Fabian Grünbichler [this message]
2025-09-08 13:53 ` [pve-devel] [PATCH proxmox-offline-mirror 3/8] wizard: switch to .pgp for Debian keyring files Shannon Sterz
2025-09-09 8:24 ` Fabian Grünbichler
2025-09-08 13:16 ` [pve-devel] [PATCH proxmox-offline-mirror 4/8] wizard: use /usr/share/keyring/proxmox-release-bookworm.gpg Fabian Grünbichler
2025-09-08 13:16 ` [pve-devel] [PATCH proxmox-offline-mirror 5/8] wizard: simplify Proxmox repository url generation Fabian Grünbichler
2025-09-08 15:20 ` Shannon Sterz
2025-09-09 8:35 ` Fabian Grünbichler
2025-09-08 13:16 ` [pve-devel] [PATCH proxmox-offline-mirror 6/8] wizard: drop Release::Buster and Ceph::Luminous/Nautilus Fabian Grünbichler
2025-09-08 13:16 ` [pve-devel] [PATCH proxmox-offline-mirror 7/8] wizard: simplify default Debian components Fabian Grünbichler
2025-09-08 13:16 ` [pve-devel] [PATCH proxmox-offline-mirror 8/8] wizard: deduplicate Proxmox key path mapping Fabian Grünbichler
2025-09-08 15:27 ` [pve-devel] [PATCH proxmox-offline-mirror 0/8] misc. wizard cleanup Shannon Sterz
2025-09-09 9:02 ` [pve-devel] applied-series: " 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=20250908131658.650928-4-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@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