From: Shannon Sterz <s.sterz@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer v2 2/3] country.pl: remove generating mirror information
Date: Mon, 22 Sep 2025 11:08:55 +0200 [thread overview]
Message-ID: <20250922090855.58508-4-s.sterz@proxmox.com> (raw)
In-Reply-To: <20250922090855.58508-2-s.sterz@proxmox.com>
this is no longer needed, as we don't rely on this information in the
installer anymore.
Suggested-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
---
country.pl | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/country.pl b/country.pl
index 227eba4..be760bb 100755
--- a/country.pl
+++ b/country.pl
@@ -8,23 +8,20 @@ use JSON qw(from_json to_json);
# Generates a
#
-# - country code => name/kmap/mirror
# - name => country code
#
# mapping for each defined country
my sub generate_country_mappings {
- my ($country_codes, $defmap, $mirrors) = @_;
+ my ($country_codes, $defmap) = @_;
my ($countries, $countryhash) = ({}, {});
foreach my $cc (sort keys %$country_codes) {
my $name = $country_codes->{$cc};
my $kmap = $defmap->{$cc} || '';
- my $mirror = $mirrors->{$cc} || '';
$countries->{$cc} = {
name => $name,
kmap => $kmap,
- mirror => $mirror,
};
$countryhash->{ lc($name) } = $cc;
}
@@ -124,12 +121,7 @@ my $defmap = {
'li' => 'de-ch',
};
-my $mirrors = PVE::Tools::debmirrors();
-foreach my $cc (keys %$mirrors) {
- die "undefined country code '$cc'" if !defined($country_codes->{$cc});
-}
-
-my ($countries, $countryhash) = generate_country_mappings($country_codes, $defmap, $mirrors);
+my ($countries, $countryhash) = generate_country_mappings($country_codes, $defmap);
my ($kmap, $kmaphash) = generate_keymaps($country_codes);
my ($zones, $cczones) = parse_zoneinfo($countries);
--
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-22 9:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-22 9:08 [pve-devel] [PATCH installer v2 0/3] remove mirror selection from installer Shannon Sterz
2025-09-22 9:08 ` [pve-devel] [PATCH installer v2 1/3] install: don't select a debian mirror based on the country anymore Shannon Sterz
2025-09-22 9:08 ` Shannon Sterz [this message]
2025-09-22 10:33 ` [pve-devel] [PATCH installer v2 2/3] country.pl: remove generating mirror information Christoph Heiss
2025-09-22 12:08 ` Shannon Sterz
2025-09-22 9:08 ` [pve-devel] [PATCH installer v2 3/3] html/country: update explanatory text to not mention setting a mirror Shannon Sterz
2025-09-22 12:12 ` [pve-devel] Superseded: Re: [PATCH installer v2 0/3] remove mirror selection from installer Shannon Sterz
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=20250922090855.58508-4-s.sterz@proxmox.com \
--to=s.sterz@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